From patchwork Sun Aug 4 15:40:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishka Dasgupta X-Patchwork-Id: 11074777 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9097A14E5 for ; Sun, 4 Aug 2019 15:40:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79E7A283C5 for ; Sun, 4 Aug 2019 15:40:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B3C5286BD; Sun, 4 Aug 2019 15:40:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D045283C5 for ; Sun, 4 Aug 2019 15:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726319AbfHDPkn (ORCPT ); Sun, 4 Aug 2019 11:40:43 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:38408 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726181AbfHDPkn (ORCPT ); Sun, 4 Aug 2019 11:40:43 -0400 Received: by mail-pl1-f196.google.com with SMTP id az7so35439947plb.5; Sun, 04 Aug 2019 08:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FoMhUlXgwlF+TgX60dUm1t1N5XFU9W1iJC3WQszsdrU=; b=N0/r/5ltGTXkFVCCRh/UKBHLfDMswOFiylibDtY70dtFOVOGNfo+QAnC8CNHJGCTNe Vj37Ic+njeNjSPkWSlCk7qdVus6KA9wdEMBpJBF9vzSI/qAAfjH+7vb+Wod9sk75ihDo q3+cXgnxpVobnPjbRQ0xr8QvvEUNvdq2GVQ2oQeL6yyXZRXU0v1vHUSm/uOvBSQdDiA0 vGaihEnbjJNDnTpwB/Y4u7TsTPJWaVScpy+6jxDFH38eWY/Wm8rK/hK5o87DySuGA2Dl EKBd0XRepz+facT+fw5zMxe68qUxX+QoJ1S9jpPrNumnCmyk7O8FUpgK+dehuUdKtVEQ fyaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FoMhUlXgwlF+TgX60dUm1t1N5XFU9W1iJC3WQszsdrU=; b=pPSS3peGId6uNKrkpBD5oZTIDMUBzhBLZEFCAGPwEZ4DssfCu12QCckv6Anwq0xJVp NDWxBQik4A4nW6l4xZ+t4nG5ZPZvxg76Gdv6k4wuKabe6Xj+HANpD5Xp3sh8PwrveQ37 zFe2JGXvxw7G0BLXRAedHpe/1ETdA0+5AZh5sNjEuQ6ONK25rn2x6LDFs4eHudErSzYQ H50MyErnddH0W5n1bSYPxEkysFvk4ooiHwpDfdaBwwCSTb3UL/xhoBJc4SNykV8A7no5 iL1OYFzLMGvGMrB50VvPOxkiXLcS8pnAuVNeIEuWW//hj2Y6DZ30igRiZn+qfsvRIuwZ fkqQ== X-Gm-Message-State: APjAAAVPjSrBPICVhM5iilALY2+TWkmhiU9uANPwd2w4Mj7gk+CJi4O7 72VzBMnGL7at4WTsmVtCEbM= X-Google-Smtp-Source: APXvYqxhqprLEO7bMHgqNw5sKOGYh9+Xdqof3Z3TIGhGAA5NC4gSln+tX0fWp6lVvSXuZLPoKGo07A== X-Received: by 2002:a17:902:12d:: with SMTP id 42mr133306364plb.187.1564933242828; Sun, 04 Aug 2019 08:40:42 -0700 (PDT) Received: from localhost.localdomain ([122.163.105.8]) by smtp.gmail.com with ESMTPSA id 5sm16005320pgh.93.2019.08.04.08.40.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 08:40:42 -0700 (PDT) From: Nishka Dasgupta To: geert+renesas@glider.be, linus.walleij@linaro.org, linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nishka Dasgupta Subject: [PATCH] pinctrl: rzn1: Add of_node_put() before return Date: Sun, 4 Aug 2019 21:10:29 +0530 Message-Id: <20190804154029.2749-1-nishkadg.linux@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Each iteration of for_each_child_of_node puts the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return in three places. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta Reviewed-by: Geert Uytterhoeven --- drivers/pinctrl/pinctrl-rzn1.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rzn1.c b/drivers/pinctrl/pinctrl-rzn1.c index cc0e5aa9128a..0f6f8a10a53a 100644 --- a/drivers/pinctrl/pinctrl-rzn1.c +++ b/drivers/pinctrl/pinctrl-rzn1.c @@ -412,8 +412,10 @@ static int rzn1_dt_node_to_map(struct pinctrl_dev *pctldev, for_each_child_of_node(np, child) { ret = rzn1_dt_node_to_map_one(pctldev, child, map, num_maps); - if (ret < 0) + if (ret < 0) { + of_node_put(child); return ret; + } } return 0; @@ -792,8 +794,10 @@ static int rzn1_pinctrl_parse_functions(struct device_node *np, grp = &ipctl->groups[ipctl->ngroups]; grp->func = func->name; ret = rzn1_pinctrl_parse_groups(child, grp, ipctl); - if (ret < 0) + if (ret < 0) { + of_node_put(child); return ret; + } i++; ipctl->ngroups++; } @@ -838,8 +842,10 @@ static int rzn1_pinctrl_probe_dt(struct platform_device *pdev, for_each_child_of_node(np, child) { ret = rzn1_pinctrl_parse_functions(child, ipctl, i++); - if (ret < 0) + if (ret < 0) { + of_node_put(child); return ret; + } } return 0;