diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-03-06 14:05:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 16:01:51 -0700 |
| commit | 211dfa81845fb609e91816791df78d60426777c0 (patch) | |
| tree | 2b50d2ebef0066b34591a34e8c316ef822b40205 /drivers | |
| parent | f6146e2078dfefc3518cf424aaa4ace9dcb1465a (diff) | |
| download | lwn-211dfa81845fb609e91816791df78d60426777c0.tar.gz lwn-211dfa81845fb609e91816791df78d60426777c0.zip | |
drm/i915: fix small leak on overlay error path
commit 915a428e43acfd05e4ffeaf40549b0cf163eebe2 upstream.
We should free "params" before returning.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 2639591c72e9..63f569b580b5 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -1083,14 +1083,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); @@ -1180,6 +1184,7 @@ out_unlock: mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->mode_config.mutex); drm_gem_object_unreference(new_bo); +out_free: kfree(params); return ret; |