From: Julia Lawall <julia.lawall@lip6.fr>
To: Brian Norris <computersforpeace@gmail.com>
Cc: kernel-janitors@vger.kernel.org,
David Woodhouse <dwmw2@infradead.org>,
linux-mtd@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
linux-kernel@vger.kernel.org,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Andrew Lunn <andrew@lunn.ch>, Bjorn Helgaas <bhelgaas@google.com>,
Jason Cooper <jason@lakedaemon.net>,
Kamal Dasu <kdasu.kdev@gmail.com>
Subject: [PATCH 1/4 v2] mtd: brcmnand: improve memory management
Date: Thu, 19 Nov 2015 22:32:15 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.02.1511192231330.2106@localhost6.localdomain6> (raw)
In-Reply-To: <20151119192632.GH64635@google.com>
This patch addresses two related memory management issues in the probe
function:
1. for_each_available_child_of_node performs an of_node_get on each
iteration, so a break out of the loop requires an of_node_put.
A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr):
// <smpl>
@@
expression root,e;
local idexpression child;
@@
for_each_available_child_of_node(root, child) {
... when != of_node_put(child)
when != e = child
(
return child;
|
+ of_node_put(child);
? return ...;
)
...
}
// </smpl>
2. The devm_kzalloc'd data is not used if brcmnand_init_cs fails. Free it
immediately, using devm_kfree in this case, instead of waiting for the
remove function.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
v2: Drop of_node_get addition, as another patch will get rid of the need
for it completely.
drivers/mtd/nand/brcmnand/brcmnand.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 2a437c7..551d474 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -2237,15 +2237,19 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
struct brcmnand_host *host;
host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
- if (!host)
+ if (!host) {
+ of_node_put(child);
return -ENOMEM;
+ }
host->pdev = pdev;
host->ctrl = ctrl;
host->of_node = child;
ret = brcmnand_init_cs(host);
- if (ret)
+ if (ret) {
+ devm_kfree(dev, host);
continue; /* Try all chip-selects */
+ }
list_add_tail(&host->node, &ctrl->host_list);
}
next prev parent reply other threads:[~2015-11-19 21:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-18 22:04 [PATCH 0/4] add missing of_node_put Julia Lawall
2015-11-18 22:04 ` [PATCH 1/4] mtd: brcmnand: improve memory management Julia Lawall
2015-11-18 22:44 ` Brian Norris
2015-11-19 6:13 ` Julia Lawall
2015-11-19 19:26 ` Brian Norris
2015-11-19 21:32 ` Julia Lawall [this message]
2015-12-01 1:56 ` [PATCH 1/4 v2] " Brian Norris
2015-11-18 22:04 ` [PATCH 2/4] mtd: nand: sunxi: add missing of_node_put Julia Lawall
2015-11-23 7:26 ` Chen-Yu Tsai
2015-11-23 13:59 ` Boris Brezillon
2015-12-01 1:56 ` Brian Norris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1511192231330.2106@localhost6.localdomain6 \
--to=julia.lawall@lip6.fr \
--cc=andrew@lunn.ch \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bhelgaas@google.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=jason@lakedaemon.net \
--cc=kdasu.kdev@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox