Commit f494c191 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: at91: use devm_kasprintf() to avoid potential leaks (part 2) 



Use devm_kasprintf() instead of kasprintf() to avoid any potential
leaks. At the moment drivers have no remove functionality hence
there is no need for fixes tag.

While at it, switch to use devm_kasprintf_strarray().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Tested-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230215134242.37618-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent dc3c7404

drivers/pinctrl/pinctrl-at91.c

+17 −6
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/string_helpers.h>





/* Since we request GPIOs from ourself */

/* Since we request GPIOs from ourself */

#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/consumer.h>
@@ -1371,6 +1372,7 @@ static int at91_pinctrl_probe_dt(struct platform_device *pdev, 




static int at91_pinctrl_probe(struct platform_device *pdev)

static int at91_pinctrl_probe(struct platform_device *pdev)

{

{

	struct device *dev = &pdev->dev;

	struct at91_pinctrl *info;

	struct at91_pinctrl *info;

	struct pinctrl_pin_desc *pdesc;

	struct pinctrl_pin_desc *pdesc;

	int ret, i, j, k;

	int ret, i, j, k;
@@ -1394,9 +1396,19 @@ static int at91_pinctrl_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;





	for (i = 0, k = 0; i < gpio_banks; i++) {

	for (i = 0, k = 0; i < gpio_banks; i++) {

		char **names;



		names = devm_kasprintf_strarray(dev, "pio", MAX_NB_GPIO_PER_BANK);

		if (!names)

			return -ENOMEM;



		for (j = 0; j < MAX_NB_GPIO_PER_BANK; j++, k++) {

		for (j = 0; j < MAX_NB_GPIO_PER_BANK; j++, k++) {

			char *name = names[j];



			strreplace(name, '-', i + 'A');



			pdesc->number = k;

			pdesc->number = k;

			pdesc->name = kasprintf(GFP_KERNEL, "pio%c%d", i + 'A', j);

			pdesc->name = name;

			pdesc++;

			pdesc++;

		}

		}

	}

	}
@@ -1797,7 +1809,8 @@ static const struct of_device_id at91_gpio_of_match[] = { 




static int at91_gpio_probe(struct platform_device *pdev)

static int at91_gpio_probe(struct platform_device *pdev)

{

{

	struct device_node *np = pdev->dev.of_node;

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct at91_gpio_chip *at91_chip = NULL;

	struct at91_gpio_chip *at91_chip = NULL;

	struct gpio_chip *chip;

	struct gpio_chip *chip;

	struct pinctrl_gpio_range *range;

	struct pinctrl_gpio_range *range;
@@ -1866,16 +1879,14 @@ static int at91_gpio_probe(struct platform_device *pdev) 
			chip->ngpio = ngpio;

			chip->ngpio = ngpio;

	}

	}





	names = devm_kcalloc(&pdev->dev, chip->ngpio, sizeof(char *),

	names = devm_kasprintf_strarray(dev, "pio", chip->ngpio);

			     GFP_KERNEL);



	if (!names) {

	if (!names) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto clk_enable_err;

		goto clk_enable_err;

	}

	}





	for (i = 0; i < chip->ngpio; i++)

	for (i = 0; i < chip->ngpio; i++)

		names[i] = devm_kasprintf(&pdev->dev, GFP_KERNEL, "pio%c%d", alias_idx + 'A', i);

		strreplace(names[i], '-', alias_idx + 'A');





	chip->names = (const char *const *)names;

	chip->names = (const char *const *)names;