From 67df9cd38d7a69fd7d0b8e412d7545312ff2051e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 21 Oct 2008 11:53:01 -0700 Subject: [PATCH] --- yaml --- r: 117244 b: refs/heads/master c: 7e78f72524b794fa8d73dc59aeeacc12a2e937fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_drawable.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 35d39496ffd7..3973f4627c3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49568873705e45a0de77b7824a9a46d3201019a7 +refs/heads/master: 7e78f72524b794fa8d73dc59aeeacc12a2e937fe diff --git a/trunk/drivers/gpu/drm/drm_drawable.c b/trunk/drivers/gpu/drm/drm_drawable.c index 4a794d89942b..80be1cab62af 100644 --- a/trunk/drivers/gpu/drm/drm_drawable.c +++ b/trunk/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);