diff options
| author |   Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-08-15 11:35:03 +0530 |
|---|---|---|
| committer |   Geert Uytterhoeven <geert+renesas@glider.be> | 2019-08-23 09:08:10 +0200 |
| commit | ab6366ee887a273d2d33a204b7ea6e6fb2fe20e4 (patch) | |
| tree | 0db1fc1d8e2b4c04c61325170988a0fe5f890de9 /drivers/pinctrl/pinctrl-rza1.c | |
| parent | pinctrl: sh-pfc: Include the right header (diff) | |
| download | linux-dev-ab6366ee887a273d2d33a204b7ea6e6fb2fe20e4.tar.xz linux-dev-ab6366ee887a273d2d33a204b7ea6e6fb2fe20e4.zip | |
pinctrl: rza1: Add of_node_put() before return
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>
Diffstat (limited to 'drivers/pinctrl/pinctrl-rza1.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-rza1.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c index 68aeefe29144..017fc6b3e27e 100644 --- a/drivers/pinctrl/pinctrl-rza1.c +++ b/drivers/pinctrl/pinctrl-rza1.c @@ -866,8 +866,10 @@ static int rza1_dt_node_pin_count(struct device_node *np) npins = 0; for_each_child_of_node(np, child) { of_pins = of_find_property(child, "pinmux", NULL); - if (!of_pins) + if (!of_pins) { + of_node_put(child); return -EINVAL; + } npins += of_pins->length / sizeof(u32); } @@ -1025,8 +1027,10 @@ static int rza1_dt_node_to_map(struct pinctrl_dev *pctldev, for_each_child_of_node(np, child) { ret = rza1_parse_pinmux_node(rza1_pctl, child, mux_conf, grpin); - if (ret < 0) + if (ret < 0) { + of_node_put(child); return ret; + } grpin += ret; mux_conf += ret; @@ -1272,8 +1276,10 @@ static int rza1_gpio_register(struct rza1_pinctrl *rza1_pctl) ret = rza1_parse_gpiochip(rza1_pctl, child, &gpio_chips[i], &gpio_ranges[i]); - if (ret) + if (ret) { + of_node_put(child); return ret; + } ++i; } |