Commit 03865dd8 authored by Haotian Zhang's avatar Haotian Zhang Committed by Lee Jones
Browse files

leds: netxbig: Fix GPIO descriptor leak in error paths 



The function netxbig_gpio_ext_get() acquires GPIO descriptors but
fails to release them when errors occur mid-way through initialization.
The cleanup callback registered by devm_add_action_or_reset() only
runs on success, leaving acquired GPIOs leaked on error paths.

Add goto-based error handling to release all acquired GPIOs before
returning errors.

Fixes: 9af512e8 ("leds: netxbig: Convert to use GPIO descriptors")
Suggested-by: default avatarMarkus Elfring <Markus.Elfring@web.de>
Signed-off-by: default avatarHaotian Zhang <vulab@iscas.ac.cn>
Link: https://patch.msgid.link/20251031021620.781-1-vulab@iscas.ac.cn


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 43495961

drivers/leds/leds-netxbig.c

+26 −10
Original line number Diff line number Diff line
@@ -364,6 +364,9 @@ static int netxbig_gpio_ext_get(struct device *dev, 
	if (!addr)

		return -ENOMEM;



	gpio_ext->addr = addr;

	gpio_ext->num_addr = 0;



	/*

	 * We cannot use devm_ managed resources with these GPIO descriptors

	 * since they are associated with the "GPIO extension device" which
@@ -375,45 +378,58 @@ static int netxbig_gpio_ext_get(struct device *dev, 
		gpiod = gpiod_get_index(gpio_ext_dev, "addr", i,

					GPIOD_OUT_LOW);

		if (IS_ERR(gpiod))

			return PTR_ERR(gpiod);

			goto err_set_code;

		gpiod_set_consumer_name(gpiod, "GPIO extension addr");

		addr[i] = gpiod;

		gpio_ext->num_addr++;

	}

	gpio_ext->addr = addr;

	gpio_ext->num_addr = num_addr;



	ret = gpiod_count(gpio_ext_dev, "data");

	if (ret < 0) {

		dev_err(dev,

			"Failed to count GPIOs in DT property data-gpios\n");

		return ret;

		goto err_free_addr;

	}

	num_data = ret;

	data = devm_kcalloc(dev, num_data, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;

	if (!data) {

		ret = -ENOMEM;

		goto err_free_addr;

	}



	gpio_ext->data = data;

	gpio_ext->num_data = 0;



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

		gpiod = gpiod_get_index(gpio_ext_dev, "data", i,

					GPIOD_OUT_LOW);

		if (IS_ERR(gpiod))

			return PTR_ERR(gpiod);

			goto err_free_data;

		gpiod_set_consumer_name(gpiod, "GPIO extension data");

		data[i] = gpiod;

		gpio_ext->num_data++;

	}

	gpio_ext->data = data;

	gpio_ext->num_data = num_data;



	gpiod = gpiod_get(gpio_ext_dev, "enable", GPIOD_OUT_LOW);

	if (IS_ERR(gpiod)) {

		dev_err(dev,

			"Failed to get GPIO from DT property enable-gpio\n");

		return PTR_ERR(gpiod);

		goto err_free_data;

	}

	gpiod_set_consumer_name(gpiod, "GPIO extension enable");

	gpio_ext->enable = gpiod;



	return devm_add_action_or_reset(dev, netxbig_gpio_ext_remove, gpio_ext);



err_free_data:

	for (i = 0; i < gpio_ext->num_data; i++)

		gpiod_put(gpio_ext->data[i]);

err_set_code:

	ret = PTR_ERR(gpiod);

err_free_addr:

	for (i = 0; i < gpio_ext->num_addr; i++)

		gpiod_put(gpio_ext->addr[i]);

	return ret;

}



static int netxbig_leds_get_of_pdata(struct device *dev,