Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751361AbbDZFPi (ORCPT ); Sun, 26 Apr 2015 01:15:38 -0400 Received: from linuxhacker.ru ([217.76.32.60]:55537 "EHLO fiona.linuxhacker.ru" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751195AbbDZFPT (ORCPT ); Sun, 26 Apr 2015 01:15:19 -0400 From: green@linuxhacker.ru To: David Airlie , dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org (open list), kernel-janitors@vger.kernel.org, Oleg Drokin , Daniel Vetter Subject: [PATCH 2/2] drm: fix a memleak on mutex failure path Date: Sun, 26 Apr 2015 01:14:29 -0400 Message-Id: <1430025269-26243-3-git-send-email-green@linuxhacker.ru> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430025269-26243-1-git-send-email-green@linuxhacker.ru> References: <1430025269-26243-1-git-send-email-green@linuxhacker.ru> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1223 Lines: 41 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 Found with smatch. Signed-off-by: Oleg Drokin CC: Daniel Vetter --- 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 -- 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/