* [PATCH v2] drm: fix a memleak on mutex failure path
@ 2015-04-27 15:36 green
2015-04-28 7:25 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: green @ 2015-04-27 15:36 UTC (permalink / raw)
To: David Airlie, dri-devel
Cc: linux-kernel, kernel-janitors, Jani Nikula, Oleg Drokin, Daniel Vetter
From: Oleg Drokin <green@linuxhacker.ru>
Need to free just allocated ctx allocation if we cannot
get our config mutex.
This one has been flagged by kbuild bot all the way back in August,
but somehow nobody picked it up:
https://lists.01.org/pipermail/kbuild/2014-August/001691.html
In addition there is another failure path that leaks the same
ctx reference that is fixed.
Found with smatch.
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
CC: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/drm_modeset_lock.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 51cc47d..c0a5cd8 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -80,8 +80,10 @@ int __drm_modeset_lock_all(struct drm_device *dev,
return -ENOMEM;
if (trylock) {
- if (!mutex_trylock(&config->mutex))
- return -EBUSY;
+ if (!mutex_trylock(&config->mutex)) {
+ ret = -EBUSY;
+ goto out;
+ }
} else {
mutex_lock(&config->mutex);
}
@@ -114,6 +116,8 @@ fail:
goto retry;
}
+out:
+ kfree(ctx);
return ret;
}
EXPORT_SYMBOL(__drm_modeset_lock_all);
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm: fix a memleak on mutex failure path
2015-04-27 15:36 [PATCH v2] drm: fix a memleak on mutex failure path green
@ 2015-04-28 7:25 ` Jani Nikula
2015-05-05 7:27 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2015-04-28 7:25 UTC (permalink / raw)
To: green, David Airlie, dri-devel
Cc: linux-kernel, kernel-janitors, Oleg Drokin, Daniel Vetter
On Mon, 27 Apr 2015, green@linuxhacker.ru wrote:
> From: Oleg Drokin <green@linuxhacker.ru>
>
> Need to free just allocated ctx allocation if we cannot
> get our config mutex.
>
> This one has been flagged by kbuild bot all the way back in August,
> but somehow nobody picked it up:
> https://lists.01.org/pipermail/kbuild/2014-August/001691.html
>
> In addition there is another failure path that leaks the same
> ctx reference that is fixed.
>
> Found with smatch.
>
> Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
> CC: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 51cc47d..c0a5cd8 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -80,8 +80,10 @@ int __drm_modeset_lock_all(struct drm_device *dev,
> return -ENOMEM;
>
> if (trylock) {
> - if (!mutex_trylock(&config->mutex))
> - return -EBUSY;
> + if (!mutex_trylock(&config->mutex)) {
> + ret = -EBUSY;
> + goto out;
> + }
> } else {
> mutex_lock(&config->mutex);
> }
> @@ -114,6 +116,8 @@ fail:
> goto retry;
> }
>
> +out:
> + kfree(ctx);
> return ret;
> }
> EXPORT_SYMBOL(__drm_modeset_lock_all);
> --
> 2.1.0
>
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm: fix a memleak on mutex failure path
2015-04-28 7:25 ` Jani Nikula
@ 2015-05-05 7:27 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2015-05-05 7:27 UTC (permalink / raw)
To: Jani Nikula
Cc: green, David Airlie, dri-devel, linux-kernel, kernel-janitors,
Daniel Vetter
On Tue, Apr 28, 2015 at 10:25:46AM +0300, Jani Nikula wrote:
> On Mon, 27 Apr 2015, green@linuxhacker.ru wrote:
> > From: Oleg Drokin <green@linuxhacker.ru>
> >
> > Need to free just allocated ctx allocation if we cannot
> > get our config mutex.
> >
> > This one has been flagged by kbuild bot all the way back in August,
> > but somehow nobody picked it up:
> > https://lists.01.org/pipermail/kbuild/2014-August/001691.html
> >
> > In addition there is another failure path that leaks the same
> > ctx reference that is fixed.
> >
> > Found with smatch.
> >
> > Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
> > CC: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Applied to topic/drm-misc, thanks.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-05 7:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-27 15:36 [PATCH v2] drm: fix a memleak on mutex failure path green
2015-04-28 7:25 ` Jani Nikula
2015-05-05 7:27 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).