瀏覽代碼

gpio: mockup: dynamically allocate memory for chip name

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>
Bartosz Golaszewski 8 年之前
父節點
當前提交
ad6d8004fa
共有 1 個文件被更改,包括 7 次插入3 次删除
  1. 7 3
      drivers/gpio/gpio-mockup.c

+ 7 - 3
drivers/gpio/gpio-mockup.c

@@ -126,7 +126,7 @@ static int mockup_gpio_probe(struct platform_device *pdev)
 	int i;
 	int i;
 	int base;
 	int base;
 	int ngpio;
 	int ngpio;
-	char chip_name[sizeof(GPIO_NAME) + 3];
+	char *chip_name;
 
 
 	if (gpio_mockup_params_nr < 2)
 	if (gpio_mockup_params_nr < 2)
 		return -EINVAL;
 		return -EINVAL;
@@ -146,8 +146,12 @@ static int mockup_gpio_probe(struct platform_device *pdev)
 			ngpio = gpio_mockup_ranges[i * 2 + 1] - base;
 			ngpio = gpio_mockup_ranges[i * 2 + 1] - base;
 
 
 		if (ngpio >= 0) {
 		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],
 			ret = mockup_gpio_add(dev, &cntr[i],
 					      chip_name, base, ngpio);
 					      chip_name, base, ngpio);
 		} else {
 		} else {