Skip to content

Commit

Permalink
drm/i915: fix small leak on overlay error path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Eric Anholt committed Mar 17, 2010
1 parent 1f2b101 commit 915a428
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/gpu/drm/i915/intel_overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -1165,6 +1169,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
mutex_unlock(&dev->struct_mutex);
mutex_unlock(&dev->mode_config.mutex);
drm_gem_object_unreference_unlocked(new_bo);
out_free:
kfree(params);

return ret;
Expand Down

0 comments on commit 915a428

Please sign in to comment.