* [patch] i915: fix small leak on error path
@ 2010-03-06 11:05 Dan Carpenter
2010-03-06 11:50 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2010-03-06 11:05 UTC (permalink / raw)
To: David Airlie
Cc: Luca Barbieri, Daniel Vetter, kernel-janitors, linux-kernel,
dri-devel
We should free "params" before returning.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index d355d1d..60595fc 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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] i915: fix small leak on error path
2010-03-06 11:05 [patch] i915: fix small leak on error path Dan Carpenter
@ 2010-03-06 11:50 ` Daniel Vetter
2010-03-17 20:30 ` Eric Anholt
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2010-03-06 11:50 UTC (permalink / raw)
To: Dan Carpenter, David Airlie, Eric Anholt, Daniel Vetter,
maximlevitsky, Chris Wilson, Luca Barbieri, dri-devel,
linux-kernel, kernel-janitors
Oh, dang. Thanks for catching this. Eric, please merge.
Cc: stable@kernel.org (for .33)
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
On Sat, Mar 06, 2010 at 02:05:39PM +0300, Dan Carpenter wrote:
> We should free "params" before returning.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index d355d1d..60595fc 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;
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] i915: fix small leak on error path
2010-03-06 11:50 ` Daniel Vetter
@ 2010-03-17 20:30 ` Eric Anholt
0 siblings, 0 replies; 3+ messages in thread
From: Eric Anholt @ 2010-03-17 20:30 UTC (permalink / raw)
To: Daniel Vetter, Dan Carpenter, David Airlie, Daniel Vetter,
maximlevitsky, Chris Wilson, Luca Barbieri, dri-devel,
linux-kernel, kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
On Sat, 6 Mar 2010 12:50:54 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
> Oh, dang. Thanks for catching this. Eric, please merge.
>
> Cc: stable@kernel.org (for .33)
> Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
>
> On Sat, Mar 06, 2010 at 02:05:39PM +0300, Dan Carpenter wrote:
> > We should free "params" before returning.
> >
> > Signed-off-by: Dan Carpenter <error27@gmail.com>
Applied. Thanks!
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-17 20:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-06 11:05 [patch] i915: fix small leak on error path Dan Carpenter
2010-03-06 11:50 ` Daniel Vetter
2010-03-17 20:30 ` Eric Anholt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox