[PATCH] arcnet: com20020-pci:Check devm_kasprintf() returned value

[PATCH] arcnet: com20020-pci:Check devm_kasprintf() returned value

[Charles Han]

devm_kasprintf() can return a NULL pointer on failure but this returned
value is not checked.

Fix this lack and check the returned value.

Fixes: 8890624a4e8c ("arcnet: com20020-pci: add led trigger support")
Signed-off-by: Charles Han <hanchunchao@inspur.com>
---
 drivers/net/arcnet/com20020-pci.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index c5e571ec94c9..ca393f9658e9 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -254,6 +254,10 @@ static int com20020pci_probe(struct pci_dev *pdev,
 			card->tx_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
 							"pci:green:tx:%d-%d",
 							dev->dev_id, i);
+			if (!card->tx_led.default_trigger || !card->tx_led.name) {
+				ret = -ENOMEM;
+				goto err_free_arcdev;
+			}
 
 			card->tx_led.dev = &dev->dev;
 			card->recon_led.brightness_set = led_recon_set;
@@ -263,6 +267,11 @@ static int com20020pci_probe(struct pci_dev *pdev,
 			card->recon_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
 							"pci:red:recon:%d-%d",
 							dev->dev_id, i);
+			if (!card->recon_led.default_trigger || !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);
-- 
2.31.1

Re: [PATCH] arcnet: com20020-pci:Check devm_kasprintf() returned value

[Simon Horman]

On Wed, Aug 28, 2024 at 02:19:41PM +0800, Charles Han 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.
> 
> Fixes: 8890624a4e8c ("arcnet: com20020-pci: add led trigger support")
> Signed-off-by: Charles Han <hanchunchao@inspur.com>

nit: I think there should be a space after each ':' in the subject.
     Also, IMHO, return value is a bit more natural.

Subject: [PATCH] arcnet: com20020-pci: Check devm_kasprintf() return value

> ---
>  drivers/net/arcnet/com20020-pci.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
> index c5e571ec94c9..ca393f9658e9 100644
> --- a/drivers/net/arcnet/com20020-pci.c
> +++ b/drivers/net/arcnet/com20020-pci.c
> @@ -254,6 +254,10 @@ static int com20020pci_probe(struct pci_dev *pdev,
>  			card->tx_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
>  							"pci:green:tx:%d-%d",
>  							dev->dev_id, i);
> +			if (!card->tx_led.default_trigger || !card->tx_led.name) {
> +				ret = -ENOMEM;
> +				goto err_free_arcdev;
> +			}

I'd prefer if the error values were checked one by one.

			card->tx_led.default_trigger = ...
			if (!card->tx_led.default_trigger) {
				...
			}

			card->tx_led.name = ...
			if (!card->tx_led.default_trigger) {
				...
			}

>  
>  			card->tx_led.dev = &dev->dev;
>  			card->recon_led.brightness_set = led_recon_set;
> @@ -263,6 +267,11 @@ static int com20020pci_probe(struct pci_dev *pdev,
>  			card->recon_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
>  							"pci:red:recon:%d-%d",
>  							dev->dev_id, i);
> +			if (!card->recon_led.default_trigger || !card->recon_led.name) {

Ditto.

> +				ret = -ENOMEM;
> +				goto err_free_arcdev;
> +			}
> +
>  			card->recon_led.dev = &dev->dev;
>  
>  			ret = devm_led_classdev_register(&pdev->dev, &card->tx_led);