pinctrl: freescale: imx: Add of_node_put() before return (bf4b87b0) · Commits · 戴 / test

Each iteration of for_each_child_of_node() puts the previous node; however, in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence put of_node_put() statements as required before two mid-loop return statements. Issue found with Coccinelle. Signed-off-by:

Nishka Dasgupta <nishkadg.linux@gmail.com> Link: https://lore.kernel.org/r/20190808074720.15754-1-nishkadg.linux@gmail.com Reviewed-by:

Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by:

Linus Walleij <linus.walleij@linaro.org>

drivers/pinctrl/freescale/pinctrl-imx.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -672,8 +672,10 @@ static int imx_pinctrl_parse_functions(struct device_node *np,

		grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),
		GFP_KERNEL);
		if (!grp)
		if (!grp) {
		of_node_put(child);
		return -ENOMEM;
		}

		mutex_lock(&ipctl->mutex);
		radix_tree_insert(&pctl->pin_group_tree,
		@@ -697,14 +699,19 @@ static bool imx_pinctrl_dt_is_flat_functions(struct device_node *np)
		struct device_node *pinctrl_np;

		for_each_child_of_node(np, function_np) {
		if (of_property_read_bool(function_np, "fsl,pins"))
		if (of_property_read_bool(function_np, "fsl,pins")) {
		of_node_put(function_np);
		return true;
		}

		for_each_child_of_node(function_np, pinctrl_np) {
		if (of_property_read_bool(pinctrl_np, "fsl,pins"))
		if (of_property_read_bool(pinctrl_np, "fsl,pins")) {
		of_node_put(pinctrl_np);
		of_node_put(function_np);
		return false;
		}
		}
		}

		return true;
		}

Admin message