From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2AF0C0650F for ; Thu, 8 Aug 2019 07:51:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B7A6D218FC for ; Thu, 8 Aug 2019 07:51:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KL23nRWw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BtojRtPb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7A6D218FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=iyV3aMubbc3yHCLvk8ZdmjGUMwNlWmo3jas/F7Icy7U=; b=KL23nRWwpUJJRM G7wZM/crT+j7QPdMeNWkYNwk0OLWX53iKcmZWurggDsqQR14Ck5M5GQqJ1wC/SOnc1clmLTEu4QKg 7DTZ1NFoGuVNpHQqhJGZTO43Vwewh/Zoyt6d6Bs7YS9azYEsJ0Yd4aAAHhGP8XOLKvLnSpW8kIF9v kI2AEBVNApSmC/PM33tmF1uH9bXvLhUBityDVJwDhfmaFrCmdpfwmoqKtrjPPIZ9Vlnr0rwc7WdQd M0Zu5oeMI+tZGKWACSGQUouQ8iLeu/S9OqcKzcQW4xbm5Hh1G/h7E8onC4ktD9qpAZl5ZpqNwy60o GQkHu7bihnUCVrcv6Xnw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hvdD0-0002Us-Ox; Thu, 08 Aug 2019 07:51:38 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hvdCg-0002Mh-UP; Thu, 08 Aug 2019 07:51:20 +0000 Received: by mail-pg1-x541.google.com with SMTP id z14so6386741pga.5; Thu, 08 Aug 2019 00:51:18 -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=SSnnmihUYLaKXzyTPjYYLBxGDRScrz3svy/ObDo3mAc=; b=BtojRtPbMAjLmUGMQJ7ClEybpXmv1+Mi+UUo849LLaPZo5nuf6jZnK6D3bQwIswvED kbYiM1hgXX4lE8iBai3WptwYBKYczV6YmPJv2Dvc47CpcvGV10QThi+ZVyDdzWcoIGR+ 2As0qPeitNIQIzWxcGvN9W2M/hn7heivuNUKGcWEJ9iFfFdBSlSq5pmQQI+zkafMN6jU uPtznbzr6CKpnEcRdMY1nUpmGoZQ9zqz+7C8CNR3vWzjrcwB9+kn4YTGjCuYKNsVM8qE 7+XQ+dYeInr435rJCAzO5e31+XRunfkyMHyycSnQdfUJpGAR0kkjcSx+3tRGIgJI3AkQ RifA== 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=SSnnmihUYLaKXzyTPjYYLBxGDRScrz3svy/ObDo3mAc=; b=eaY0SMQpphQo+P3sSbAwxL1+NnTUEUkMjLY51oZ12hZqvyHotCau/SE3QsIR5f4BDI elH0i/9az9661x1l438sVtRFUujfkx7NFLNJPCU9EJ2TjfyRkLvNgVKTUKNPpci6HR8z NQ77sSDuGMLxzK+8LZY/9CQaGZpS9U2ouODhG/tbcwj/iKCBjPW/Z1fTvCIR10f4Njj4 D4ETfpHds7ilhvZ5qYxKZNEOUFEjXdmdhH4sVKk7FqizBKCnJGkDc22J5BNHgw1C9DQE xeENywLnJZsKh6L75VlhYE6oMPNVxMekGX9rWwxd7J3FVtwvP8Kdd4vzDaBOVg4Ch2If Lr9Q== X-Gm-Message-State: APjAAAWC/4B6NyHcy1lUbwNMCY0ZGpGZyv0UyABFrPKZ2rWcsGZvf8d7 eKFV8jzOwjAfm7hCGFHoqxg= X-Google-Smtp-Source: APXvYqzb4BAVBg0ifb2x9rYLwX8aneK9iIJBFsc6LtMuNn4lmieiAChuS3Dt/gOZYeg60hNjARY1iw== X-Received: by 2002:a63:c50f:: with SMTP id f15mr11538416pgd.372.1565250678430; Thu, 08 Aug 2019 00:51:18 -0700 (PDT) Received: from localhost.localdomain ([122.163.44.6]) by smtp.gmail.com with ESMTPSA id c69sm3279009pje.6.2019.08.08.00.51.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 08 Aug 2019 00:51:17 -0700 (PDT) From: Nishka Dasgupta To: marek.vasut@gmail.com, tudor.ambarus@microchip.com, dwmw2@infradead.org, computersforpeace@gmail.com, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, joel@jms.id.au, andrew@aj.id.au, linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH] mtd: spi-nor: aspeed-smc: Add of_node_put() Date: Thu, 8 Aug 2019 13:21:04 +0530 Message-Id: <20190808075104.15928-1-nishkadg.linux@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190808_005118_982116_56C7CACF X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nishka Dasgupta Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Each iteration of for_each_available_child_of_node puts the previous node, but in the case of a break from the middle of the loop, there is no put, thus causing a memory leak. Upon termination of the loop (whether by break or a natural exit), either ret will have a non-zero value or child will be NULL. Hence add an of_node_put() that will execute only when ret has a non-zero value, as calling of_node_put() on a possible NULL value does not cause any further issues. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta --- drivers/mtd/spi-nor/aspeed-smc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi-nor/aspeed-smc.c b/drivers/mtd/spi-nor/aspeed-smc.c index 19b8757325d2..009c1da8574c 100644 --- a/drivers/mtd/spi-nor/aspeed-smc.c +++ b/drivers/mtd/spi-nor/aspeed-smc.c @@ -836,8 +836,10 @@ static int aspeed_smc_setup_flash(struct aspeed_smc_controller *controller, controller->chips[cs] = chip; } - if (ret) + if (ret) { + of_node_put(child); aspeed_smc_unregister(controller); + } return ret; } -- 2.19.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel