arcnet: Add NULL check in com20020pci_probe()
Subsystems (3)
PATCH v2 1/1 arcnet: Add NULL check in com20020pci_probe()
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.
---
V1 -> V2: Add a test after each devm_kasprintf().
drivers/net/arcnet/com20020-pci.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/arcnet/com20020-pci.c +8 -1
@@ -251,18 +251,25 @@ 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) +return -ENOMEM ; card->tx_led.name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"pci:green:tx:%d-%d" , dev->dev_id, i); - +if (!card->tx_led.name) +return -ENOMEM ; 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) +return -ENOMEM ; card->recon_led.name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"pci:red:recon:%d-%d" , dev->dev_id, i); +if (!card->recon_led.name) +return -ENOMEM ; card->recon_led.dev = &dev->dev; ret =devm_led_classdev_register (&pdev->dev, &card->tx_led);
Signature · 1 line
2.34.1
Quoted 1 line
devm_kasprintf()return NULL if memory allocation fails. Currently,
…
call? failed?
Quoted 1 line
Add NULL check after
devm_kasprintf()to prevent this issue.
Please complete also the corresponding exception handling.
Source code example for further inspiration:
https://elixir.bootlin.com/linux/v6.14-rc6/source/drivers/net/arcnet/com20020-pci.c#L239-L244
Thus I suggest to use another label like “e_nomem” for this purpose.
Regards,
Markus
Simon Horman
reviewerQuoted 5 lines · Markus Elfring
Quoted 1 line
devm_kasprintf()return NULL if memory allocation fails. Currently,…
call? failed?
Quoted 8 lines
Quoted 1 line
Add NULL check after
devm_kasprintf()to prevent this issue.Please complete also the corresponding exception handling.
Source code example for further inspiration:
https://elixir.bootlin.com/linux/v6.14-rc6/source/drivers/net/arcnet/com20020-pci.c#L239-L244Thus I suggest to use another label like “e_nomem” for this purpose.
Ok, but surely the err_free_arcdev label can be reused for this purpose.
PATCH v3 1/1 arcnet: Add NULL check in com20020pci_probe()
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.
---
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(-)
drivers/net/arcnet/com20020-pci.c +16 -1
@@ -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);
Signature · 1 line
2.34.1
…
Quoted 2 lines
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.
…
Quoted 2 lines
---
V2 -> V3: Reuse labelerr_free_arcdevfor exception handing.
…
drivers/net/arcnet/com20020-pci.c static int com20020pci_probe(struct pci_dev *pdev, · line 257
Quoted 9 lines
+++
b/drivers/net/arcnet/com20020-pci.cdrivers/net/arcnet/com20020-pci.c +4
-0@@ -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
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 2 Apr 2025 21:50:36 +0800 you wrote:
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.[...]
Here is the summary with links:
- [v3] arcnet: Add NULL check in com20020pci_probe()
https://git.kernel.org/netdev/net/c/fda8c491db2a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html