From patchwork Tue Sep 25 07:11:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 11703 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D855323E53 for ; Tue, 25 Sep 2012 07:15:19 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 80946A19008 for ; Tue, 25 Sep 2012 07:15:19 +0000 (UTC) Received: by ieje10 with SMTP id e10so12109877iej.11 for ; Tue, 25 Sep 2012 00:15:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=RnvNiKVCQL9w7Djp3UUMRvIn+XyzIHcS+0846r5tbfg=; b=ITVAD+nZrh/gTA7Fl3+2sB2fdQ95NHsZC2OF0YyxXoea/ikIAbVhvybAIbUrIpjr3D rLr1pVVcK5kVdzoJ/qXzIKDoLRKya/m5GAGgUHv61/Kb1eW60/h4uyCLoz6K+ceJFoTd cOj1xTxiaV4LC72Wpv6NEqjkFmMQh78QWEvcby1rKvMKU5lnMeMk/8NKNw38eGt//cWA HKIUL2LxRO6yAz9f04aGEpwjkZhwdzOsVfm1b6T7j1oPGDEHlzROyUKLnKZCTaPnX2Sa 81BRny1QGPkzA8U8IID+T09JKYXptee1whBLfttb4eDd8abTbLuMMdUhBGH5tVnYqlnp bpIg== Received: by 10.50.217.227 with SMTP id pb3mr7425205igc.28.1348557318886; Tue, 25 Sep 2012 00:15:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp279859igc; Tue, 25 Sep 2012 00:15:18 -0700 (PDT) Received: by 10.66.86.201 with SMTP id r9mr38657798paz.16.1348557318297; Tue, 25 Sep 2012 00:15:18 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id ts2si22008684pbc.116.2012.09.25.00.15.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Sep 2012 00:15:18 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by pbcmd12 with SMTP id md12so14807609pbc.37 for ; Tue, 25 Sep 2012 00:15:18 -0700 (PDT) Received: by 10.68.242.164 with SMTP id wr4mr43743348pbc.41.1348557317894; Tue, 25 Sep 2012 00:15:17 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id py9sm10919471pbb.20.2012.09.25.00.15.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Sep 2012 00:15:17 -0700 (PDT) From: Sachin Kamat To: linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH] pinctrl: Fix potential memory leak in pinctrl_register_one_pin() Date: Tue, 25 Sep 2012 12:41:40 +0530 Message-Id: <1348557100-16972-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQlHK1fRmg8G5wcnMYxJ2SSdSYRm1UuBMl50pbnBcTUpgFrL0kxwT0O7Mt2UntND/vjOL+/k 'pindesc' was not freed when returning from an error induced exit path. Signed-off-by: Sachin Kamat --- drivers/pinctrl/core.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index dc5c126..0f1ec9e 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -230,8 +230,10 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev, pindesc->name = name; } else { pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number); - if (pindesc->name == NULL) + if (pindesc->name == NULL) { + kfree(pindesc); return -ENOMEM; + } pindesc->dynamic_name = true; }