devm_kasprintf() can return a NULL pointer on failure but this returned value is not checked. Fix this lack and check the returned value.
Found by code review.
Cc: stable@vger.kernel.org Fixes: 32c170ff15b0 ("pinctrl: stm32: set default gpio line names using pin names") Signed-off-by: Ma Ke make24@iscas.ac.cn --- drivers/pinctrl/stm32/pinctrl-stm32.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index a8673739871d..53306d939d14 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -1374,8 +1374,13 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode
for (i = 0; i < npins; i++) { stm32_pin = stm32_pctrl_get_desc_pin_from_gpio(pctl, bank, i); - if (stm32_pin && stm32_pin->pin.name) + if (stm32_pin && stm32_pin->pin.name) { names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s", stm32_pin->pin.name); + if (!name[i]) { + err = -ENOMEM; + goto err_clk; + } + } else names[i] = NULL; }
On 9/5/24 5:02 AM, Ma Ke wrote:
devm_kasprintf() can return a NULL pointer on failure but this returned value is not checked. Fix this lack and check the returned value.
Found by code review.
Cc: stable@vger.kernel.org Fixes: 32c170ff15b0 ("pinctrl: stm32: set default gpio line names using pin names") Signed-off-by: Ma Ke make24@iscas.ac.cn
drivers/pinctrl/stm32/pinctrl-stm32.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index a8673739871d..53306d939d14 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -1374,8 +1374,13 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode for (i = 0; i < npins; i++) { stm32_pin = stm32_pctrl_get_desc_pin_from_gpio(pctl, bank, i);
if (stm32_pin && stm32_pin->pin.name)
if (stm32_pin && stm32_pin->pin.name) { names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s", stm32_pin->pin.name);if (!name[i]) {err = -ENOMEM;goto err_clk;}}
That doesn't comply with the kernel coding style -- it now needs to be:
} else { names[i] = NULL; } [...]
MBR, Sergey
Hi Ma,
kernel test robot noticed the following build errors:
[auto build test ERROR on atorgue-stm32/stm32-next] [also build test ERROR on linusw-pinctrl/devel linusw-pinctrl/for-next akpm-mm/mm-everything linus/master v6.11-rc6 next-20240905] [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/Ma-Ke/pinctrl-stm32-check-dev... base: https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next patch link: https://lore.kernel.org/r/20240905020244.355474-1-make24%40iscas.ac.cn patch subject: [PATCH] pinctrl: stm32: check devm_kasprintf() returned value config: arc-randconfig-001-20240906 (https://download.01.org/0day-ci/archive/20240906/202409060455.cCSXg0Gt-lkp@i...) compiler: arceb-elf-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240906/202409060455.cCSXg0Gt-lkp@i...)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot lkp@intel.com | Closes: https://lore.kernel.org/oe-kbuild-all/202409060455.cCSXg0Gt-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/pinctrl/stm32/pinctrl-stm32.c: In function 'stm32_gpiolib_register_bank':
drivers/pinctrl/stm32/pinctrl-stm32.c:1379:30: error: 'name' undeclared (first use in this function); did you mean 'names'?
1379 | if (!name[i]) { | ^~~~ | names drivers/pinctrl/stm32/pinctrl-stm32.c:1379:30: note: each undeclared identifier is reported only once for each function it appears in
vim +1379 drivers/pinctrl/stm32/pinctrl-stm32.c
1287 1288 static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode_handle *fwnode) 1289 { 1290 struct stm32_gpio_bank *bank = &pctl->banks[pctl->nbanks]; 1291 int bank_ioport_nr; 1292 struct pinctrl_gpio_range *range = &bank->range; 1293 struct fwnode_reference_args args; 1294 struct device *dev = pctl->dev; 1295 struct resource res; 1296 int npins = STM32_GPIO_PINS_PER_BANK; 1297 int bank_nr, err, i = 0; 1298 struct stm32_desc_pin *stm32_pin; 1299 char **names; 1300 1301 if (!IS_ERR(bank->rstc)) 1302 reset_control_deassert(bank->rstc); 1303 1304 if (of_address_to_resource(to_of_node(fwnode), 0, &res)) 1305 return -ENODEV; 1306 1307 bank->base = devm_ioremap_resource(dev, &res); 1308 if (IS_ERR(bank->base)) 1309 return PTR_ERR(bank->base); 1310 1311 err = clk_prepare_enable(bank->clk); 1312 if (err) { 1313 dev_err(dev, "failed to prepare_enable clk (%d)\n", err); 1314 return err; 1315 } 1316 1317 bank->gpio_chip = stm32_gpio_template; 1318 1319 fwnode_property_read_string(fwnode, "st,bank-name", &bank->gpio_chip.label); 1320 1321 if (!fwnode_property_get_reference_args(fwnode, "gpio-ranges", NULL, 3, i, &args)) { 1322 bank_nr = args.args[1] / STM32_GPIO_PINS_PER_BANK; 1323 bank->gpio_chip.base = args.args[1]; 1324 1325 /* get the last defined gpio line (offset + nb of pins) */ 1326 npins = args.args[0] + args.args[2]; 1327 while (!fwnode_property_get_reference_args(fwnode, "gpio-ranges", NULL, 3, ++i, &args)) 1328 npins = max(npins, (int)(args.args[0] + args.args[2])); 1329 } else { 1330 bank_nr = pctl->nbanks; 1331 bank->gpio_chip.base = bank_nr * STM32_GPIO_PINS_PER_BANK; 1332 range->name = bank->gpio_chip.label; 1333 range->id = bank_nr; 1334 range->pin_base = range->id * STM32_GPIO_PINS_PER_BANK; 1335 range->base = range->id * STM32_GPIO_PINS_PER_BANK; 1336 range->npins = npins; 1337 range->gc = &bank->gpio_chip; 1338 pinctrl_add_gpio_range(pctl->pctl_dev, 1339 &pctl->banks[bank_nr].range); 1340 } 1341 1342 if (fwnode_property_read_u32(fwnode, "st,bank-ioport", &bank_ioport_nr)) 1343 bank_ioport_nr = bank_nr; 1344 1345 bank->gpio_chip.base = -1; 1346 1347 bank->gpio_chip.ngpio = npins; 1348 bank->gpio_chip.fwnode = fwnode; 1349 bank->gpio_chip.parent = dev; 1350 bank->bank_nr = bank_nr; 1351 bank->bank_ioport_nr = bank_ioport_nr; 1352 bank->secure_control = pctl->match_data->secure_control; 1353 spin_lock_init(&bank->lock); 1354 1355 if (pctl->domain) { 1356 /* create irq hierarchical domain */ 1357 bank->fwnode = fwnode; 1358 1359 bank->domain = irq_domain_create_hierarchy(pctl->domain, 0, STM32_GPIO_IRQ_LINE, 1360 bank->fwnode, &stm32_gpio_domain_ops, 1361 bank); 1362 1363 if (!bank->domain) { 1364 err = -ENODEV; 1365 goto err_clk; 1366 } 1367 } 1368 1369 names = devm_kcalloc(dev, npins, sizeof(char *), GFP_KERNEL); 1370 if (!names) { 1371 err = -ENOMEM; 1372 goto err_clk; 1373 } 1374 1375 for (i = 0; i < npins; i++) { 1376 stm32_pin = stm32_pctrl_get_desc_pin_from_gpio(pctl, bank, i); 1377 if (stm32_pin && stm32_pin->pin.name) { 1378 names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s", stm32_pin->pin.name);
1379 if (!name[i]) {
1380 err = -ENOMEM; 1381 goto err_clk; 1382 } 1383 } 1384 else 1385 names[i] = NULL; 1386 } 1387 1388 bank->gpio_chip.names = (const char * const *)names; 1389 1390 err = gpiochip_add_data(&bank->gpio_chip, bank); 1391 if (err) { 1392 dev_err(dev, "Failed to add gpiochip(%d)!\n", bank_nr); 1393 goto err_clk; 1394 } 1395 1396 dev_info(dev, "%s bank added\n", bank->gpio_chip.label); 1397 return 0; 1398 1399 err_clk: 1400 clk_disable_unprepare(bank->clk); 1401 return err; 1402 } 1403
linux-stable-mirror@lists.linaro.org
-
kernel test robot -
Ma Ke -
Sergey Shtylyov