diff options
| author |   Dan Carpenter <error27@gmail.com> | 2010-03-06 14:05:39 +0300 |
|---|---|---|
| committer |   Eric Anholt <eric@anholt.net> | 2010-03-17 13:30:15 -0700 |
| commit | 915a428e43acfd05e4ffeaf40549b0cf163eebe2 (patch) | |
| tree | 717b701bbc378aa06ace37c11c45716be8794dc1 /drivers/gpu/drm/i915 | |
| parent | drm/i915: Avoid NULL deref in get_pages() unwind after error. (diff) | |
| download | linux-dev-915a428e43acfd05e4ffeaf40549b0cf163eebe2.tar.xz linux-dev-915a428e43acfd05e4ffeaf40549b0cf163eebe2.zip | |
drm/i915: fix small leak on overlay error path
We should free "params" before returning.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Cc: stable@kernel.org (for .33)
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index d355d1d527e7..60595fc26fdd 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -1068,14 +1068,18 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, drmmode_obj = drm_mode_object_find(dev, put_image_rec->crtc_id, DRM_MODE_OBJECT_CRTC); - if (!drmmode_obj) - return -ENOENT; + if (!drmmode_obj) { + ret = -ENOENT; + goto out_free; + } crtc = to_intel_crtc(obj_to_crtc(drmmode_obj)); new_bo = drm_gem_object_lookup(dev, file_priv, put_image_rec->bo_handle); - if (!new_bo) - return -ENOENT; + if (!new_bo) { + ret = -ENOENT; + goto out_free; + } mutex_lock(&dev->mode_config.mutex); mutex_lock(&dev->struct_mutex); @@ -1165,6 +1169,7 @@ out_unlock: mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->mode_config.mutex); drm_gem_object_unreference_unlocked(new_bo); +out_free: kfree(params); return ret; |