pinctrl: st: Add of_node_put() before return (19d17d93) · 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> Link: https://lore.kernel.org/r/20190815060609.3056-1-nishkadg.linux@gmail.com Signed-off-by:

Linus Walleij <linus.walleij@linaro.org>

drivers/pinctrl/pinctrl-st.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1263,9 +1263,11 @@ static int st_pctl_parse_functions(struct device_node *np,
		grp = &info->groups[*grp_index];
		*grp_index += 1;
		ret = st_pctl_dt_parse_groups(child, grp, info, i++);
		if (ret)
		if (ret) {
		of_node_put(child);
		return ret;
		}
		}
		dev_info(info->dev, "Function[%d\t name:%s,\tgroups:%d]\n",
		index, func->name, func->ngroups);

		@@ -1624,8 +1626,10 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
		if (of_property_read_bool(child, "gpio-controller")) {
		const char *bank_name = NULL;
		ret = st_gpiolib_register_bank(info, bank, child);
		if (ret)
		if (ret) {
		of_node_put(child);
		return ret;
		}

		k = info->banks[bank].range.pin_base;
		bank_name = info->banks[bank].range.name;
		@@ -1642,6 +1646,7 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
		i++, &grp_index);
		if (ret) {
		dev_err(&pdev->dev, "No functions found.\n");
		of_node_put(child);
		return ret;
		}
		}

Admin message