mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

leds: max77650: Add of_node_put() before return

Browse source 
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 create a new label, err_node_put, which puts the previous node and
returns variable rv. Modify the mid-loop return statements to instead
store the return value in rv and jump to err_node_put.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Reviewed-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
This commit is contained in:
Nishka Dasgupta 2019-07-11 13:24:05 +05:30 committed by Jacek Anaszewski
parent 533016c870
commit 730f693d79
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/leds/leds-max77650.c
View file

@ -91,8 +91,10 @@ static int max77650_led_probe(struct platform_device *pdev)
for_each_child_of_node(of_node, child) { for_each_child_of_node(of_node, child) {
rv = of_property_read_u32(child, "reg", &reg); rv = of_property_read_u32(child, "reg", &reg);
if (rv || reg >= MAX77650_LED_NUM_LEDS) if (rv || reg >= MAX77650_LED_NUM_LEDS) {
return -EINVAL; rv = -EINVAL;
goto err_node_put;
}
led = &leds[reg]; led = &leds[reg];
led->map = map; led->map = map;
@ -107,8 +109,10 @@ static int max77650_led_probe(struct platform_device *pdev)
} else { } else {
led->cdev.name = devm_kasprintf(dev, GFP_KERNEL, led->cdev.name = devm_kasprintf(dev, GFP_KERNEL,
"max77650:%s", label); "max77650:%s", label);
if (!led->cdev.name) if (!led->cdev.name) {
return -ENOMEM; rv = -ENOMEM;
goto err_node_put;
}
} }
of_property_read_string(child, "linux,default-trigger", of_property_read_string(child, "linux,default-trigger",
@ -116,20 +120,23 @@ static int max77650_led_probe(struct platform_device *pdev)
rv = devm_of_led_classdev_register(dev, child, &led->cdev); rv = devm_of_led_classdev_register(dev, child, &led->cdev);
if (rv) if (rv)
return rv; goto err_node_put;
rv = regmap_write(map, led->regA, MAX77650_LED_A_DEFAULT); rv = regmap_write(map, led->regA, MAX77650_LED_A_DEFAULT);
if (rv) if (rv)
return rv; goto err_node_put;
rv = regmap_write(map, led->regB, MAX77650_LED_B_DEFAULT); rv = regmap_write(map, led->regB, MAX77650_LED_B_DEFAULT);
if (rv) if (rv)
return rv; goto err_node_put;
} }
return regmap_write(map, return regmap_write(map,
MAX77650_REG_CNFG_LED_TOP, MAX77650_REG_CNFG_LED_TOP,
MAX77650_LED_TOP_DEFAULT); MAX77650_LED_TOP_DEFAULT);
err_node_put:
of_node_put(child);
return rv;
} }
static struct platform_driver max77650_led_driver = { static struct platform_driver max77650_led_driver = {