Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d92f71e authored by Axel Lin's avatar Axel Lin Committed by Greg Kroah-Hartman
Browse files

Staging: android: timed_gpio: Fix resource leak in timed_gpio_probe error paths 



If gpio_request fails, we need to free all allocated resources.
Current code uses wrong array index to access gpio_data array.
So current code actually frees gpio_data[i].gpio by j times.

This patch moves the error handling code to err_out and thus improves
readability.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 099f5d01

drivers/staging/android/timed_gpio.c

+15 −12
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int timed_gpio_probe(struct platform_device *pdev) 
	struct timed_gpio_platform_data *pdata = pdev->dev.platform_data;

	struct timed_gpio *cur_gpio;

	struct timed_gpio_data *gpio_data, *gpio_dat;

	int i, j, ret = 0;

	int i, ret;



	if (!pdata)

		return -EBUSY;
@@ -108,18 +108,12 @@ static int timed_gpio_probe(struct platform_device *pdev) 
		gpio_dat->dev.get_time = gpio_get_time;

		gpio_dat->dev.enable = gpio_enable;

		ret = gpio_request(cur_gpio->gpio, cur_gpio->name);

		if (ret >= 0) {

			ret = timed_output_dev_register(&gpio_dat->dev);

		if (ret < 0)

				gpio_free(cur_gpio->gpio);

		}

			goto err_out;

		ret = timed_output_dev_register(&gpio_dat->dev);

		if (ret < 0) {

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

				timed_output_dev_unregister(&gpio_data[i].dev);

				gpio_free(gpio_data[i].gpio);

			}

			kfree(gpio_data);

			return ret;

			gpio_free(cur_gpio->gpio);

			goto err_out;

		}



		gpio_dat->gpio = cur_gpio->gpio;
@@ -131,6 +125,15 @@ static int timed_gpio_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, gpio_data);



	return 0;



err_out:

	while (--i >= 0) {

		timed_output_dev_unregister(&gpio_data[i].dev);

		gpio_free(gpio_data[i].gpio);

	}

	kfree(gpio_data);



	return ret;

}



static int timed_gpio_remove(struct platform_device *pdev)