diff options
author | Dan Carpenter <error27@gmail.com> | 2010-03-06 06:05:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 19:01:51 -0400 |
commit | 211dfa81845fb609e91816791df78d60426777c0 (patch) | |
tree | 2b50d2ebef0066b34591a34e8c316ef822b40205 /drivers/gpu/drm/i915/intel_overlay.c | |
parent | f6146e2078dfefc3518cf424aaa4ace9dcb1465a (diff) |
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/gpu/drm/i915/intel_overlay.c')
-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, | |||
1083 | 1083 | ||
1084 | drmmode_obj = drm_mode_object_find(dev, put_image_rec->crtc_id, | 1084 | drmmode_obj = drm_mode_object_find(dev, put_image_rec->crtc_id, |
1085 | DRM_MODE_OBJECT_CRTC); | 1085 | DRM_MODE_OBJECT_CRTC); |
1086 | if (!drmmode_obj) | 1086 | if (!drmmode_obj) { |
1087 | return -ENOENT; | 1087 | ret = -ENOENT; |
1088 | goto out_free; | ||
1089 | } | ||
1088 | crtc = to_intel_crtc(obj_to_crtc(drmmode_obj)); | 1090 | crtc = to_intel_crtc(obj_to_crtc(drmmode_obj)); |
1089 | 1091 | ||
1090 | new_bo = drm_gem_object_lookup(dev, file_priv, | 1092 | new_bo = drm_gem_object_lookup(dev, file_priv, |
1091 | put_image_rec->bo_handle); | 1093 | put_image_rec->bo_handle); |
1092 | if (!new_bo) | 1094 | if (!new_bo) { |
1093 | return -ENOENT; | 1095 | ret = -ENOENT; |
1096 | goto out_free; | ||
1097 | } | ||
1094 | 1098 | ||
1095 | mutex_lock(&dev->mode_config.mutex); | 1099 | mutex_lock(&dev->mode_config.mutex); |
1096 | mutex_lock(&dev->struct_mutex); | 1100 | mutex_lock(&dev->struct_mutex); |
@@ -1180,6 +1184,7 @@ out_unlock: | |||
1180 | mutex_unlock(&dev->struct_mutex); | 1184 | mutex_unlock(&dev->struct_mutex); |
1181 | mutex_unlock(&dev->mode_config.mutex); | 1185 | mutex_unlock(&dev->mode_config.mutex); |
1182 | drm_gem_object_unreference(new_bo); | 1186 | drm_gem_object_unreference(new_bo); |
1187 | out_free: | ||
1183 | kfree(params); | 1188 | kfree(params); |
1184 | 1189 | ||
1185 | return ret; | 1190 | return ret; |