]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/modes: Avoid divide by zero harder in drm_mode_vrefresh()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 29 Nov 2024 04:26:28 +0000 (06:26 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 13 Dec 2024 22:05:32 +0000 (00:05 +0200)
drm_mode_vrefresh() is trying to avoid divide by zero
by checking whether htotal or vtotal are zero. But we may
still end up with a div-by-zero of vtotal*htotal*...

Cc: stable@vger.kernel.org
Reported-by: syzbot+622bba18029bcde672e1@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=622bba18029bcde672e1
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241129042629.18280-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/drm_modes.c

index 6ba167a3346134072d100af0adbbe9b49e970769..71573b85d9242eed856069bd98dd8469daf89ef7 100644 (file)
@@ -1287,14 +1287,11 @@ EXPORT_SYMBOL(drm_mode_set_name);
  */
 int drm_mode_vrefresh(const struct drm_display_mode *mode)
 {
-       unsigned int num, den;
+       unsigned int num = 1, den = 1;
 
        if (mode->htotal == 0 || mode->vtotal == 0)
                return 0;
 
-       num = mode->clock;
-       den = mode->htotal * mode->vtotal;
-
        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                num *= 2;
        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
@@ -1302,6 +1299,12 @@ int drm_mode_vrefresh(const struct drm_display_mode *mode)
        if (mode->vscan > 1)
                den *= mode->vscan;
 
+       if (check_mul_overflow(mode->clock, num, &num))
+               return 0;
+
+       if (check_mul_overflow(mode->htotal * mode->vtotal, den, &den))
+               return 0;
+
        return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(num, 1000), den);
 }
 EXPORT_SYMBOL(drm_mode_vrefresh);