OSDN Git Service

gpio: mockup: dynamically allocate memory for chip name
authorBartosz Golaszewski <bgolaszewski@baylibre.com>
Tue, 20 Dec 2016 11:28:19 +0000 (12:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 08:39:13 +0000 (08:39 +0000)
[ 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: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpio/gpio-mockup.c

index 1ef85b0..d27e936 100644 (file)
@@ -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,
-                               pins_name_start + i);
+                       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 {