pinctrl: rzn1: Add of_node_put() before return (2f64dc70) · Commits · 戴 / test

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 <nishkadg.linux@gmail.com> Signed-off-by:

Geert Uytterhoeven <geert+renesas@glider.be>

drivers/pinctrl/pinctrl-rzn1.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -412,9 +412,11 @@ 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,9 +842,11 @@ 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;
		}

Admin message