| Message ID | 20230210145656.71838-2-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: at91: Cleanups | expand |
Hi Andy,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linusw-pinctrl/devel]
[also build test WARNING on linusw-pinctrl/for-next next-20230210]
[cannot apply to clk/clk-next soc/for-next linus/master v6.2-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/pinctrl-at91-use-devm_kasprintf-to-avoid-potential-leaks-part-2/20230210-225817
base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel
patch link: https://lore.kernel.org/r/20230210145656.71838-2-andriy.shevchenko%40linux.intel.com
patch subject: [PATCH v1 1/5] pinctrl: at91: use devm_kasprintf() to avoid potential leaks (part 2)
config: arm-randconfig-r046-20230210 (https://download.01.org/0day-ci/archive/20230211/202302110336.1P7vM7AU-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/0562771ccfa099db4361c2e5958ca1685f498cdf
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Andy-Shevchenko/pinctrl-at91-use-devm_kasprintf-to-avoid-potential-leaks-part-2/20230210-225817
git checkout 0562771ccfa099db4361c2e5958ca1685f498cdf
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/pinctrl/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202302110336.1P7vM7AU-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/pinctrl/pinctrl-at91.c: In function 'at91_pinctrl_probe':
drivers/pinctrl/pinctrl-at91.c:1402:22: error: 'names' undeclared (first use in this function)
1402 | if (!names)
| ^~~~~
drivers/pinctrl/pinctrl-at91.c:1402:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/pinctrl/pinctrl-at91.c: In function 'at91_gpio_probe':
>> drivers/pinctrl/pinctrl-at91.c:1889:28: warning: passing argument 1 of 'strreplace' makes pointer from integer without a cast [-Wint-conversion]
1889 | strreplace('-', alias_idx + 'A');
| ^~~
| |
| int
In file included from include/linux/bitmap.h:11,
from include/linux/cpumask.h:12,
from include/linux/smp.h:13,
from include/linux/lockdep.h:14,
from include/linux/mutex.h:17,
from include/linux/notifier.h:14,
from include/linux/clk.h:14,
from drivers/pinctrl/pinctrl-at91.c:8:
include/linux/string.h:172:24: note: expected 'char *' but argument is of type 'int'
172 | char *strreplace(char *s, char old, char new);
| ~~~~~~^
drivers/pinctrl/pinctrl-at91.c:1889:17: error: too few arguments to function 'strreplace'
1889 | strreplace('-', alias_idx + 'A');
| ^~~~~~~~~~
include/linux/string.h:172:7: note: declared here
172 | char *strreplace(char *s, char old, char new);
| ^~~~~~~~~~
vim +/strreplace +1889 drivers/pinctrl/pinctrl-at91.c
1809
1810 static int at91_gpio_probe(struct platform_device *pdev)
1811 {
1812 struct device *dev = &pdev->dev;
1813 struct device_node *np = dev->of_node;
1814 struct at91_gpio_chip *at91_chip = NULL;
1815 struct gpio_chip *chip;
1816 struct pinctrl_gpio_range *range;
1817 int ret = 0;
1818 int irq, i;
1819 int alias_idx = of_alias_get_id(np, "gpio");
1820 uint32_t ngpio;
1821 char **names;
1822
1823 BUG_ON(alias_idx >= ARRAY_SIZE(gpio_chips));
1824 if (gpio_chips[alias_idx]) {
1825 ret = -EBUSY;
1826 goto err;
1827 }
1828
1829 irq = platform_get_irq(pdev, 0);
1830 if (irq < 0) {
1831 ret = irq;
1832 goto err;
1833 }
1834
1835 at91_chip = devm_kzalloc(&pdev->dev, sizeof(*at91_chip), GFP_KERNEL);
1836 if (!at91_chip) {
1837 ret = -ENOMEM;
1838 goto err;
1839 }
1840
1841 at91_chip->regbase = devm_platform_ioremap_resource(pdev, 0);
1842 if (IS_ERR(at91_chip->regbase)) {
1843 ret = PTR_ERR(at91_chip->regbase);
1844 goto err;
1845 }
1846
1847 at91_chip->ops = (const struct at91_pinctrl_mux_ops *)
1848 of_match_device(at91_gpio_of_match, &pdev->dev)->data;
1849 at91_chip->pioc_virq = irq;
1850 at91_chip->pioc_idx = alias_idx;
1851
1852 at91_chip->clock = devm_clk_get(&pdev->dev, NULL);
1853 if (IS_ERR(at91_chip->clock)) {
1854 dev_err(&pdev->dev, "failed to get clock, ignoring.\n");
1855 ret = PTR_ERR(at91_chip->clock);
1856 goto err;
1857 }
1858
1859 ret = clk_prepare_enable(at91_chip->clock);
1860 if (ret) {
1861 dev_err(&pdev->dev, "failed to prepare and enable clock, ignoring.\n");
1862 goto clk_enable_err;
1863 }
1864
1865 at91_chip->chip = at91_gpio_template;
1866 at91_chip->id = alias_idx;
1867
1868 chip = &at91_chip->chip;
1869 chip->label = dev_name(&pdev->dev);
1870 chip->parent = &pdev->dev;
1871 chip->owner = THIS_MODULE;
1872 chip->base = alias_idx * MAX_NB_GPIO_PER_BANK;
1873
1874 if (!of_property_read_u32(np, "#gpio-lines", &ngpio)) {
1875 if (ngpio >= MAX_NB_GPIO_PER_BANK)
1876 pr_err("at91_gpio.%d, gpio-nb >= %d failback to %d\n",
1877 alias_idx, MAX_NB_GPIO_PER_BANK, MAX_NB_GPIO_PER_BANK);
1878 else
1879 chip->ngpio = ngpio;
1880 }
1881
1882 names = devm_kasprintf_strarray(dev, "pio", chip->ngpio);
1883 if (!names) {
1884 ret = -ENOMEM;
1885 goto clk_enable_err;
1886 }
1887
1888 for (i = 0; i < chip->ngpio; i++)
> 1889 strreplace('-', alias_idx + 'A');
1890
1891 chip->names = (const char *const *)names;
1892
1893 range = &at91_chip->range;
1894 range->name = chip->label;
1895 range->id = alias_idx;
1896 range->pin_base = range->base = range->id * MAX_NB_GPIO_PER_BANK;
1897
1898 range->npins = chip->ngpio;
1899 range->gc = chip;
1900
1901 ret = at91_gpio_of_irq_setup(pdev, at91_chip);
1902 if (ret)
1903 goto gpiochip_add_err;
1904
1905 ret = gpiochip_add_data(chip, at91_chip);
1906 if (ret)
1907 goto gpiochip_add_err;
1908
1909 gpio_chips[alias_idx] = at91_chip;
1910 platform_set_drvdata(pdev, at91_chip);
1911 gpio_banks = max(gpio_banks, alias_idx + 1);
1912
1913 dev_info(&pdev->dev, "at address %p\n", at91_chip->regbase);
1914
1915 return 0;
1916
1917 gpiochip_add_err:
1918 clk_enable_err:
1919 clk_disable_unprepare(at91_chip->clock);
1920 err:
1921 dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx);
1922
1923 return ret;
1924 }
1925
Hi Andy,
I love your patch! Yet something to improve:
[auto build test ERROR on linusw-pinctrl/devel]
[also build test ERROR on linusw-pinctrl/for-next next-20230210]
[cannot apply to clk/clk-next soc/for-next linus/master v6.2-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/pinctrl-at91-use-devm_kasprintf-to-avoid-potential-leaks-part-2/20230210-225817
base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel
patch link: https://lore.kernel.org/r/20230210145656.71838-2-andriy.shevchenko%40linux.intel.com
patch subject: [PATCH v1 1/5] pinctrl: at91: use devm_kasprintf() to avoid potential leaks (part 2)
config: arm-randconfig-r046-20230210 (https://download.01.org/0day-ci/archive/20230211/202302110407.TpDeAlpQ-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/0562771ccfa099db4361c2e5958ca1685f498cdf
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Andy-Shevchenko/pinctrl-at91-use-devm_kasprintf-to-avoid-potential-leaks-part-2/20230210-225817
git checkout 0562771ccfa099db4361c2e5958ca1685f498cdf
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202302110407.TpDeAlpQ-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/pinctrl/pinctrl-at91.c: In function 'at91_pinctrl_probe':
>> drivers/pinctrl/pinctrl-at91.c:1402:22: error: 'names' undeclared (first use in this function)
1402 | if (!names)
| ^~~~~
drivers/pinctrl/pinctrl-at91.c:1402:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/pinctrl/pinctrl-at91.c: In function 'at91_gpio_probe':
drivers/pinctrl/pinctrl-at91.c:1889:28: warning: passing argument 1 of 'strreplace' makes pointer from integer without a cast [-Wint-conversion]
1889 | strreplace('-', alias_idx + 'A');
| ^~~
| |
| int
In file included from include/linux/bitmap.h:11,
from include/linux/cpumask.h:12,
from include/linux/smp.h:13,
from include/linux/lockdep.h:14,
from include/linux/mutex.h:17,
from include/linux/notifier.h:14,
from include/linux/clk.h:14,
from drivers/pinctrl/pinctrl-at91.c:8:
include/linux/string.h:172:24: note: expected 'char *' but argument is of type 'int'
172 | char *strreplace(char *s, char old, char new);
| ~~~~~~^
>> drivers/pinctrl/pinctrl-at91.c:1889:17: error: too few arguments to function 'strreplace'
1889 | strreplace('-', alias_idx + 'A');
| ^~~~~~~~~~
include/linux/string.h:172:7: note: declared here
172 | char *strreplace(char *s, char old, char new);
| ^~~~~~~~~~
vim +/names +1402 drivers/pinctrl/pinctrl-at91.c
1372
1373 static int at91_pinctrl_probe(struct platform_device *pdev)
1374 {
1375 struct device *dev = &pdev->dev;
1376 struct at91_pinctrl *info;
1377 struct pinctrl_pin_desc *pdesc;
1378 int ret, i, j, k;
1379
1380 info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
1381 if (!info)
1382 return -ENOMEM;
1383
1384 ret = at91_pinctrl_probe_dt(pdev, info);
1385 if (ret)
1386 return ret;
1387
1388 at91_pinctrl_desc.name = dev_name(&pdev->dev);
1389 at91_pinctrl_desc.npins = gpio_banks * MAX_NB_GPIO_PER_BANK;
1390 at91_pinctrl_desc.pins = pdesc =
1391 devm_kcalloc(&pdev->dev,
1392 at91_pinctrl_desc.npins, sizeof(*pdesc),
1393 GFP_KERNEL);
1394
1395 if (!at91_pinctrl_desc.pins)
1396 return -ENOMEM;
1397
1398 for (i = 0, k = 0; i < gpio_banks; i++) {
1399 char **pin_names;
1400
1401 pin_names = devm_kasprintf_strarray(dev, "pio", MAX_NB_GPIO_PER_BANK);
> 1402 if (!names)
1403 return -ENOMEM;
1404
1405 for (j = 0; j < MAX_NB_GPIO_PER_BANK; j++, k++) {
1406 char *pin_name = pin_names[j];
1407
1408 strreplace(pin_name, '-', i + 'A');
1409
1410 pdesc->number = k;
1411 pdesc->name = pin_name;
1412 pdesc++;
1413 }
1414 }
1415
1416 platform_set_drvdata(pdev, info);
1417 info->pctl = devm_pinctrl_register(&pdev->dev, &at91_pinctrl_desc,
1418 info);
1419
1420 if (IS_ERR(info->pctl)) {
1421 dev_err(&pdev->dev, "could not register AT91 pinctrl driver\n");
1422 return PTR_ERR(info->pctl);
1423 }
1424
1425 /* We will handle a range of GPIO pins */
1426 for (i = 0; i < gpio_banks; i++)
1427 if (gpio_chips[i])
1428 pinctrl_add_gpio_range(info->pctl, &gpio_chips[i]->range);
1429
1430 dev_info(&pdev->dev, "initialized AT91 pinctrl driver\n");
1431
1432 return 0;
1433 }
1434
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 735c501e7a06..bb93d8bcfd08 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -18,6 +18,7 @@ #include <linux/pm.h> #include <linux/seq_file.h> #include <linux/slab.h> +#include <linux/string_helpers.h> /* Since we request GPIOs from ourself */ #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) { + struct device *dev = &pdev->dev; struct at91_pinctrl *info; struct pinctrl_pin_desc *pdesc; int ret, i, j, k; @@ -1394,9 +1396,19 @@ static int at91_pinctrl_probe(struct platform_device *pdev) return -ENOMEM; for (i = 0, k = 0; i < gpio_banks; i++) { + char **pin_names; + + pin_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++) { + char *pin_name = pin_names[j]; + + strreplace(pin_name, '-', i + 'A'); + pdesc->number = k; - pdesc->name = kasprintf(GFP_KERNEL, "pio%c%d", i + 'A', j); + pdesc->name = pin_name; pdesc++; } } @@ -1797,7 +1809,8 @@ static const struct of_device_id at91_gpio_of_match[] = { 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 gpio_chip *chip; struct pinctrl_gpio_range *range; @@ -1866,16 +1879,14 @@ static int at91_gpio_probe(struct platform_device *pdev) chip->ngpio = ngpio; } - names = devm_kcalloc(&pdev->dev, chip->ngpio, sizeof(char *), - GFP_KERNEL); - + names = devm_kasprintf_strarray(dev, "pio", chip->ngpio); if (!names) { ret = -ENOMEM; goto clk_enable_err; } for (i = 0; i < chip->ngpio; i++) - names[i] = devm_kasprintf(&pdev->dev, GFP_KERNEL, "pio%c%d", alias_idx + 'A', i); + strreplace('-', alias_idx + 'A'); chip->names = (const char *const *)names;
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/pinctrl-at91.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)