| Message ID | 20250402135036.44697-1-bsdhenrymartin@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v3] arcnet: Add NULL check in com20020pci_probe() | expand |
… > Add NULL check after devm_kasprintf() to prevent this issue and ensure > no resources are left allocated. I hope that further refinement possibilities can be taken better into account. … > --- > V2 -> V3: Reuse label err_free_arcdev for exception handing. … > +++ b/drivers/net/arcnet/com20020-pci.c > @@ -251,18 +251,33 @@ static int com20020pci_probe(struct pci_dev *pdev, > card->tx_led.default_trigger = devm_kasprintf(&pdev->dev, > GFP_KERNEL, "arc%d-%d-tx", > dev->dev_id, i); > + if (!card->tx_led.default_trigger) { > + ret = -ENOMEM; > + goto err_free_arcdev; > + } … I propose to avoid duplicate source code also for the shown completion of the corresponding exception handling. https://wiki.sei.cmu.edu/confluence/display/c/MEM12-C.+Consider+using+a+goto+chain+when+leaving+a+function+on+error+when+using+and+releasing+resources#MEM12C.Considerusingagotochainwhenleavingafunctiononerrorwhenusingandreleasingresources-CompliantSolution(copy_process()fromLinuxkernel) See also once more: * https://lore.kernel.org/linux-kernel/?q=e_nomem * https://docs.kernel.org/process/maintainer-netdev.html Regards, Markus
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index c5e571ec94c9..0472bcdff130 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c @@ -251,18 +251,33 @@ static int com20020pci_probe(struct pci_dev *pdev, card->tx_led.default_trigger = devm_kasprintf(&pdev->dev, GFP_KERNEL, "arc%d-%d-tx", dev->dev_id, i); + if (!card->tx_led.default_trigger) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->tx_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "pci:green:tx:%d-%d", dev->dev_id, i); - + if (!card->tx_led.name) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->tx_led.dev = &dev->dev; card->recon_led.brightness_set = led_recon_set; card->recon_led.default_trigger = devm_kasprintf(&pdev->dev, GFP_KERNEL, "arc%d-%d-recon", dev->dev_id, i); + if (!card->recon_led.default_trigger) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->recon_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "pci:red:recon:%d-%d", dev->dev_id, i); + if (!card->recon_led.name) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->recon_led.dev = &dev->dev; ret = devm_led_classdev_register(&pdev->dev, &card->tx_led);
devm_kasprintf() returns NULL when memory allocation fails. Currently, com20020pci_probe() does not check for this case, which results in a NULL pointer dereference. Add NULL check after devm_kasprintf() to prevent this issue and ensure no resources are left allocated. Fixes: 6b17a597fc2f ("arcnet: restoring support for multiple Sohard Arcnet cards") Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com> --- V2 -> V3: Reuse label err_free_arcdev for exception handing. V1 -> V2: Add a test after each devm_kasprintf(). drivers/net/arcnet/com20020-pci.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)