From patchwork Mon Dec 21 00:44:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 7892891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7E14FBEEE5 for ; Mon, 21 Dec 2015 00:47:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5FA8203AC for ; Mon, 21 Dec 2015 00:47:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE8F8203AB for ; Mon, 21 Dec 2015 00:47:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aAoas-0001jm-Gj; Mon, 21 Dec 2015 00:44:54 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aAoam-0001hz-2o; Mon, 21 Dec 2015 00:44:49 +0000 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0LZeo8-1acTtz1fXI-00lToQ; Mon, 21 Dec 2015 01:44:15 +0100 From: Stefan Wahren To: Linus Walleij , Stephen Warren , Lee Jones , Eric Anholt Subject: [PATCH] pinctrl: bcm2835: Fix memory leak in error path Date: Mon, 21 Dec 2015 00:44:04 +0000 Message-Id: <1450658644-20858-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 X-Provags-ID: V03:K0:d2mwhMGaJzai2AsYY4vHWkFTCcOksPCPyLxtYFSjein88tg1/Gb Nc2zBXP5OUG8scU4UyUmlxhtyv7bZsiX3jMWYQZEOL0E1A7oj81fnZTgKXd16RN27e98thH mtzQNDE+cBTC5sF4c6Z3fx/26bX1O8HdOVxNUhkQHjnSz0GtwFx52rl+D0vgq1K+NlObNrb +uSeL+o0Qflz3Bcyk32FA== X-UI-Out-Filterresults: notjunk:1; V01:K0:C59n9iKrDss=:8Vhtt2QToJw70c4Qlugp+J XnZx4jatYYzOvuAo59kNXyP5ADZfQ+Dd7+r60xNx6Z3sQAIsEkBAMq9OzYtMPHZGxPweT47QN c6jKDI2oJQ69h2iujS5BYtXBIQnWtbBYqpz0giFKM1dXaFIZcAp6YoIv2Zz2ZjZCsYpux6wQL +kqw40fS9YruVkPZdlQXcHKZfqLKVYCScGz96gI2ZwhzgZC6s1tzd0HqJXd3e7WIk9sxW1gbi eA1k+S+8Qn26j+cJxReNZ6yVOyMskosm0x4Wb0zataoMbjKIszF/FO/K9fhf+pn5/U3355iyo HqxWkWC7bNzpn2qHZfrWjMKJd878FlXRntiwGLenRljGpKlZ427JLGgr3382rW99cAXR4Oe2d VoSOSTTb/Hx/fWiiM0tWp8BaQmPMEIw1VVFGhQx0F/pxP41eNeSRF4IiILN2g/wC645Qu+c98 5NkCXdcm4BjMsf8/3ERi0TO9PIE4cuuhflYcnt4jtbGHYtwmqy1pblznVSgt/yIGFwrx2wxN7 UDqbBjJTSKnyFEGgaduE7m/NjYvVka6XVM/rLQh7XKrdnund0EkuHfoWDIJEdvVFoW72ECwLN E0xSCnuXys3F/C2eRbkVvG4UBY+Kg0YKIDdJvdvcg4w8B5BY5zHJH0bBGrAr7LyXqU7nw1yp3 8kG3r6pXZmLtC3yEn8+uFJ3qc54lT+RBhRNDKI+n1FaRSbOgyIVneWL9CSUurp5IfYrs= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151220_164448_498835_F08851C4 X-CRM114-Status: UNSURE ( 8.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , linux-gpio@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case of an invalid pin value bcm2835_pctl_dt_node_to_map() would leak the pull configs of already assigned pins. So avoid this by calling the free map function in error case. Signed-off-by: Stefan Wahren Fixes: e1b2dc70cd5b ("pinctrl: add bcm2835 driver") Reviewed-by: Eric Anholt --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 2e6ca69..75b0d8c 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -795,7 +795,7 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev, return 0; out: - kfree(maps); + bcm2835_pctl_dt_free_map(pctldev, maps, num_pins * maps_per_pin); return err; }