Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753382AbbD1HXw (ORCPT ); Tue, 28 Apr 2015 03:23:52 -0400 Received: from mga03.intel.com ([134.134.136.65]:59970 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752556AbbD1HXt (ORCPT ); Tue, 28 Apr 2015 03:23:49 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,662,1422950400"; d="scan'208";a="716924151" From: Jani Nikula To: green@linuxhacker.ru, David Airlie , dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Oleg Drokin , Daniel Vetter Subject: Re: [PATCH v2] drm: fix a memleak on mutex failure path In-Reply-To: <1430149006-3753-1-git-send-email-green@linuxhacker.ru> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1430149006-3753-1-git-send-email-green@linuxhacker.ru> User-Agent: Notmuch/0.19+87~gcf99a78 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Tue, 28 Apr 2015 10:25:46 +0300 Message-ID: <87h9s0btol.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1706 Lines: 62 On Mon, 27 Apr 2015, green@linuxhacker.ru wrote: > From: Oleg Drokin > > 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 > CC: Daniel Vetter Reviewed-by: Jani Nikula > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/