Commit 79937a4b authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Jacek Anaszewski
Browse files

leds: ns2: 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 create a new label, err_node_put, that puts
the previous node before returning the required value. Edit the mid-loop
return sites to instead go to this new label.
Issue found with Coccinelle.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
parent 730f693d

drivers/leds/leds-ns2.c

+14 −7
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata) 
	struct device_node *np = dev->of_node;

	struct device_node *child;

	struct ns2_led *led, *leds;

	int num_leds = 0;

	int ret, num_leds = 0;



	num_leds = of_get_child_count(np);

	if (!num_leds)
@@ -259,16 +259,16 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata) 
	led = leds;

	for_each_child_of_node(np, child) {

		const char *string;

		int ret, i, num_modes;

		int i, num_modes;

		struct ns2_led_modval *modval;



		ret = of_get_named_gpio(child, "cmd-gpio", 0);

		if (ret < 0)

			return ret;

			goto err_node_put;

		led->cmd = ret;

		ret = of_get_named_gpio(child, "slow-gpio", 0);

		if (ret < 0)

			return ret;

			goto err_node_put;

		led->slow = ret;

		ret = of_property_read_string(child, "label", &string);

		led->name = (ret == 0) ? string : child->name;
@@ -281,7 +281,8 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata) 
		if (ret < 0 || ret % 3) {

			dev_err(dev,

				"Missing or malformed modes-map property\n");

			return -EINVAL;

			ret = -EINVAL;

			goto err_node_put;

		}



		num_modes = ret / 3;
@@ -289,8 +290,10 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata) 
				      num_modes,

				      sizeof(struct ns2_led_modval),

				      GFP_KERNEL);

		if (!modval)

			return -ENOMEM;

		if (!modval) {

			ret = -ENOMEM;

			goto err_node_put;

		}



		for (i = 0; i < num_modes; i++) {

			of_property_read_u32_index(child,
@@ -314,6 +317,10 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata) 
	pdata->num_leds = num_leds;



	return 0;



err_node_put:

	of_node_put(child);

	return ret;

}



static const struct of_device_id of_ns2_leds_match[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE