From 7e78f72524b794fa8d73dc59aeeacc12a2e937fe Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 21 Oct 2008 11:53:01 -0700 Subject: drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Anholt Acked-by: Michel Dänzer Signed-off-by: Dave Airlie --- drivers/gpu/drm/drm_drawable.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/drm_drawable.c b/drivers/gpu/drm/drm_drawable.c index 4a794d89942b..80be1cab62af 100644 --- a/drivers/gpu/drm/drm_drawable.c +++ b/drivers/gpu/drm/drm_drawable.c @@ -81,6 +81,10 @@ int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv) spin_lock_irqsave(&dev->drw_lock, irqflags); info = drm_get_drawable_info(dev, draw->handle); + if (info == NULL) { + spin_unlock_irqrestore(&dev->drw_lock, irqflags); + return -EINVAL; + } drm_free(info->rects, info->num_rects * sizeof(struct drm_clip_rect), DRM_MEM_BUFS); drm_free(info, sizeof(struct drm_drawable_info), DRM_MEM_BUFS); -- cgit v1.2.2