From: Jani Nikula <jani.nikula@linux.intel.com>
To: green@linuxhacker.ru, David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
kernel-janitors@vger.kernel.org,
open list <linux-kernel@vger.kernel.org>,
Oleg Drokin <green@linuxhacker.ru>
Subject: Re: [PATCH 2/2] drm: fix a memleak on mutex failure path
Date: Mon, 27 Apr 2015 11:56:00 +0300 [thread overview]
Message-ID: <87d22qc5lr.fsf@intel.com> (raw)
In-Reply-To: <1430025269-26243-3-git-send-email-green@linuxhacker.ru>
On Sun, 26 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
>
> Found with smatch.
>
> Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
> CC: Daniel Vetter <daniel.vetter@ffwll.ch>
The function has another leaking failure path, would be nice to have
that fixed too. Maybe with a common out label.
BR,
Jani.
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 51cc47d..1e8c52f 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))
> + if (!mutex_trylock(&config->mutex)) {
> + kfree(ctx);
> return -EBUSY;
> + }
> } else {
> mutex_lock(&config->mutex);
> }
> --
> 2.1.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2015-04-27 8:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-26 5:14 [PATCH 0/2] Fix a couple of dri drivers memory leaks green
2015-04-26 5:14 ` [PATCH 1/2] drm/qlx: Fix a memory leak on error path green
2015-04-26 5:14 ` [PATCH 2/2] drm: fix a memleak on mutex failure path green
2015-04-27 8:56 ` Jani Nikula [this message]
2015-04-27 15:36 ` Oleg Drokin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d22qc5lr.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=green@linuxhacker.ru \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox