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

Commit 86aa023f authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Greg Kroah-Hartman
Browse files

gpio: mockup: dynamically allocate memory for chip name 




[ Upstream commit ad6d8004fa29a8958381b60215e32d1e903b0492 ]

Currently the chip name buffer is allocated on the stack and the
address of the buffer is passed to the gpio framework. It's invalid
after probe() returns, so the sysfs label attribute displays garbage.

Use devm_kasprintf() for each string instead.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d47162bd

drivers/gpio/gpio-mockup.c

+7 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int mockup_gpio_probe(struct platform_device *pdev) 
	int i;

	int base;

	int ngpio;

	char chip_name[sizeof(GPIO_NAME) + 3];

	char *chip_name;



	if (gpio_mockup_params_nr < 2)

		return -EINVAL;
@@ -146,8 +146,12 @@ static int mockup_gpio_probe(struct platform_device *pdev) 
			ngpio = gpio_mockup_ranges[i * 2 + 1] - base;



		if (ngpio >= 0) {

			sprintf(chip_name, "%s-%c", GPIO_NAME,

			chip_name = devm_kasprintf(dev, GFP_KERNEL,

						   "%s-%c", GPIO_NAME,

						   pins_name_start + i);

			if (!chip_name)

				return -ENOMEM;



			ret = mockup_gpio_add(dev, &cntr[i],

					      chip_name, base, ngpio);

		} else {