mtd: brcmnand: improve memory management
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> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
parent
0401669797
commit
081976bcc0
|
@ -2233,15 +2233,19 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
|
||||||
struct brcmnand_host *host;
|
struct brcmnand_host *host;
|
||||||
|
|
||||||
host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
|
host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
|
||||||
if (!host)
|
if (!host) {
|
||||||
|
of_node_put(child);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
}
|
||||||
host->pdev = pdev;
|
host->pdev = pdev;
|
||||||
host->ctrl = ctrl;
|
host->ctrl = ctrl;
|
||||||
host->of_node = child;
|
host->of_node = child;
|
||||||
|
|
||||||
ret = brcmnand_init_cs(host);
|
ret = brcmnand_init_cs(host);
|
||||||
if (ret)
|
if (ret) {
|
||||||
|
devm_kfree(dev, host);
|
||||||
continue; /* Try all chip-selects */
|
continue; /* Try all chip-selects */
|
||||||
|
}
|
||||||
|
|
||||||
list_add_tail(&host->node, &ctrl->host_list);
|
list_add_tail(&host->node, &ctrl->host_list);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue