Skip to contentSkip to conversation

drm: integer overflow in drm_mode_dirtyfb_ioctl()

PATCH In review Xi Wang 4 participants 4 messages Nov 23, 2011 – Dec 14, 2011

Subsystems (2)
lore
Share & tools
lore

Xi Wang

author
#0 lore raw

PATCH 1/1 drm: integer overflow in drm_mode_dirtyfb_ioctl()

There is a potential integer overflow in drm_mode_dirtyfb_ioctl() if userspace passes in a large num_clips. The call to kmalloc would allocate a small buffer, and the call to fb->funcs->dirty may result in a memory corruption.

---
 drivers/gpu/drm/drm_crtc.c |    4 ++++
 include/drm/drm_mode.h     |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)
drivers/gpu/drm/drm_crtc.c +4 -0
index 405c63b..8323fc3 100644
@@ -1873,6 +1873,10 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
 	}
 
 	if (num_clips && clips_ptr) {
+		if (num_clips < 0 || num_clips > DRM_MODE_FB_DIRTY_MAX_CLIPS) {
+			ret = -EINVAL;
+			goto out_err1;
+		}
 		clips = kzalloc(num_clips * sizeof(*clips), GFP_KERNEL);
 		if (!clips) {
 			ret = -ENOMEM;
include/drm/drm_mode.h +2 -0
index d30bedf..ddd46db 100644
@@ -235,6 +235,8 @@ struct drm_mode_fb_cmd {
 #define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02
 #define DRM_MODE_FB_DIRTY_FLAGS         0x03
 
+#define DRM_MODE_FB_DIRTY_MAX_CLIPS     256
+
 /*
  * Mark a region of a framebuffer as dirty.
  *
Signature · 1 line
1.7.5.4
#1 lore raw

Cc'ed Dave's work email.

Quoted 43 lines · Xi Wang

There is a potential integer overflow in drm_mode_dirtyfb_ioctl() if userspace passes in a large num_clips.  The call to kmalloc would allocate a small buffer, and the call to fb->funcs->dirty may result in a memory corruption.

---
 drivers/gpu/drm/drm_crtc.c |    4 ++++
 include/drm/drm_mode.h     |    2 ++

 2 files changed, 6 insertions(+), 0 deletions(-)
drivers/gpu/drm/drm_crtc.c +4 -0
index 405c63b..8323fc3 100644
@@ -1873,6 +1873,10 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
        }
 
        if (num_clips && clips_ptr) {
+               if (num_clips < 0 || num_clips > DRM_MODE_FB_DIRTY_MAX_CLIPS) {
+                       ret = -EINVAL;
+                       goto out_err1;
+               }
                clips = kzalloc(num_clips * sizeof(*clips), GFP_KERNEL);
                if (!clips) {
                        ret = -ENOMEM;
include/drm/drm_mode.h +2 -1
index d30bedf..ddd46db 100644
@@ -235,6 +235,8 @@ struct drm_mode_fb_cmd {
  #define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02
  #define DRM_MODE_FB_DIRTY_FLAGS         0x03
 
+#define DRM_MODE_FB_DIRTY_MAX_CLIPS     256
+
  /*
  * Mark a region of a framebuffer as dirty.
  *
--

1.7.5.4

#2 lore raw

----- Original Message -----

Quoted 8 lines

From: "Eugene Teo" <[email protected]>
To: "Xi Wang" <[email protected]>
Cc: "David Airlie" <[email protected]>, [email protected], [email protected], [email protected], "Dave Airlie" <[email protected]>
Sent: Wednesday, 14 December, 2011 1:16:49 PM
Subject: Re: [PATCH] drm: integer overflow in drm_mode_dirtyfb_ioctl()

Cc'ed Dave's work email.

This is already in Linus tree, went there a while ago.

a5cd335165e31db9dbab636fd29895d41da55dd2

Dave.

#3 lore raw
Quoted 9 lines · David Airlie

----- Original Message -----

Quoted 7 lines

From: "Eugene Teo" <[email protected]>
To: "Xi Wang" <[email protected]>
Cc: "David Airlie" <[email protected]>, [email protected], [email protected], [email protected], "Dave Airlie" <[email protected]>
Sent: Wednesday, 14 December, 2011 1:16:49 PM
Subject: Re: [PATCH] drm: integer overflow in drm_mode_dirtyfb_ioctl()

Quoted 5 lines
Quoted 1 line

Cc'ed Dave's work email.

This is already in Linus tree, went there a while ago.

a5cd335165e31db9dbab636fd29895d41da55dd2

And it was in the 3.0.13 and 3.1.5 kernel releases.

greg k-h