Re: [PATCH] ieee802154: mcr20a: Fix memory leak in mcr20a_probe

2018-04-10 Thread Stefan Schmidt 
Hello.


On 04/05/2018 06:20 PM, Gustavo A. R. Silva wrote:
> Free allocated memory for pdata before return.
>
> Addresses-Coverity-ID: 1466096 ("Resource leak")
> Fixes: 8c6ad9cc5157 ("ieee802154: Add NXP MCR20A IEEE 802.15.4 transceiver 
> driver")
> Signed-off-by: Gustavo A. R. Silva 
> ---
>  drivers/net/ieee802154/mcr20a.c | 9 ++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
> index 55a22c7..944470d 100644
> --- a/drivers/net/ieee802154/mcr20a.c
> +++ b/drivers/net/ieee802154/mcr20a.c
> @@ -1267,7 +1267,7 @@ mcr20a_probe(struct spi_device *spi)
>   ret = mcr20a_get_platform_data(spi, pdata);
>   if (ret < 0) {
>   dev_crit(>dev, "mcr20a_get_platform_data failed.\n");
> - return ret;
> + goto free_pdata;
>   }
>  
>   /* init reset gpio */
> @@ -1275,7 +1275,7 @@ mcr20a_probe(struct spi_device *spi)
>   ret = devm_gpio_request_one(>dev, pdata->rst_gpio,
>   GPIOF_OUT_INIT_HIGH, "reset");
>   if (ret)
> - return ret;
> + goto free_pdata;
>   }
>  
>   /* reset mcr20a */
> @@ -1291,7 +1291,8 @@ mcr20a_probe(struct spi_device *spi)
>   hw = ieee802154_alloc_hw(sizeof(*lp), _hw_ops);
>   if (!hw) {
>   dev_crit(>dev, "ieee802154_alloc_hw failed\n");
> - return -ENOMEM;
> + ret = -ENOMEM;
> + goto free_pdata;
>   }
>  
>   /* init mcr20a local data */
> @@ -1366,6 +1367,8 @@ mcr20a_probe(struct spi_device *spi)
>  
>  free_dev:
>   ieee802154_free_hw(lp->hw);
> +free_pdata:
> + kfree(pdata);
>  
>   return ret;
>  }

This patch has been applied to the wpan tree and will be
part of the next pull request to net. Thanks!

regards
Stefan Schmidt

Re: [PATCH] ieee802154: mcr20a: Fix memory leak in mcr20a_probe

2018-04-10 Thread Stefan Schmidt 
Hello.


On 04/05/2018 06:20 PM, Gustavo A. R. Silva wrote:
> Free allocated memory for pdata before return.
>
> Addresses-Coverity-ID: 1466096 ("Resource leak")
> Fixes: 8c6ad9cc5157 ("ieee802154: Add NXP MCR20A IEEE 802.15.4 transceiver 
> driver")
> Signed-off-by: Gustavo A. R. Silva 
> ---
>  drivers/net/ieee802154/mcr20a.c | 9 ++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
> index 55a22c7..944470d 100644
> --- a/drivers/net/ieee802154/mcr20a.c
> +++ b/drivers/net/ieee802154/mcr20a.c
> @@ -1267,7 +1267,7 @@ mcr20a_probe(struct spi_device *spi)
>   ret = mcr20a_get_platform_data(spi, pdata);
>   if (ret < 0) {
>   dev_crit(>dev, "mcr20a_get_platform_data failed.\n");
> - return ret;
> + goto free_pdata;
>   }
>  
>   /* init reset gpio */
> @@ -1275,7 +1275,7 @@ mcr20a_probe(struct spi_device *spi)
>   ret = devm_gpio_request_one(>dev, pdata->rst_gpio,
>   GPIOF_OUT_INIT_HIGH, "reset");
>   if (ret)
> - return ret;
> + goto free_pdata;
>   }
>  
>   /* reset mcr20a */
> @@ -1291,7 +1291,8 @@ mcr20a_probe(struct spi_device *spi)
>   hw = ieee802154_alloc_hw(sizeof(*lp), _hw_ops);
>   if (!hw) {
>   dev_crit(>dev, "ieee802154_alloc_hw failed\n");
> - return -ENOMEM;
> + ret = -ENOMEM;
> + goto free_pdata;
>   }
>  
>   /* init mcr20a local data */
> @@ -1366,6 +1367,8 @@ mcr20a_probe(struct spi_device *spi)
>  
>  free_dev:
>   ieee802154_free_hw(lp->hw);
> +free_pdata:
> + kfree(pdata);
>  
>   return ret;
>  }

This patch has been applied to the wpan tree and will be
part of the next pull request to net. Thanks!

regards
Stefan Schmidt

Re: [PATCH] ieee802154: mcr20a: Fix memory leak in mcr20a_probe

2018-04-10 Thread Stefan Schmidt 
Hello.


On 04/10/2018 11:54 AM, Xue Liu wrote:
> Hallo,
>
> Thanks for the fix. It looks good.
>
> ACK-by: Xue Liu 

Thanks for the ACK Xue. The correct format would be

Acked-by: Xue Liu 

That way patchwork also picks the ACK up and adds it to the patch before I 
apply it from there.

No worries, I did this manually for you this time. For the next time please use 
the correct format to have this tracked.

regards
Stefan Schmidt

Re: [PATCH] ieee802154: mcr20a: Fix memory leak in mcr20a_probe

2018-04-10 Thread Stefan Schmidt 
Hello.


On 04/10/2018 11:54 AM, Xue Liu wrote:
> Hallo,
>
> Thanks for the fix. It looks good.
>
> ACK-by: Xue Liu 

Thanks for the ACK Xue. The correct format would be

Acked-by: Xue Liu 

That way patchwork also picks the ACK up and adds it to the patch before I 
apply it from there.

No worries, I did this manually for you this time. For the next time please use 
the correct format to have this tracked.

regards
Stefan Schmidt

Re: [PATCH] ieee802154: mcr20a: Fix memory leak in mcr20a_probe

2018-04-10 Thread Xue Liu 
Hallo,

Thanks for the fix. It looks good.

ACK-by: Xue Liu 

On 5 April 2018 at 18:20, Gustavo A. R. Silva  wrote:
> Free allocated memory for pdata before return.
>
> Addresses-Coverity-ID: 1466096 ("Resource leak")
> Fixes: 8c6ad9cc5157 ("ieee802154: Add NXP MCR20A IEEE 802.15.4 transceiver 
> driver")
> Signed-off-by: Gustavo A. R. Silva 
> ---
>  drivers/net/ieee802154/mcr20a.c | 9 ++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
> index 55a22c7..944470d 100644
> --- a/drivers/net/ieee802154/mcr20a.c
> +++ b/drivers/net/ieee802154/mcr20a.c
> @@ -1267,7 +1267,7 @@ mcr20a_probe(struct spi_device *spi)
> ret = mcr20a_get_platform_data(spi, pdata);
> if (ret < 0) {
> dev_crit(>dev, "mcr20a_get_platform_data failed.\n");
> -   return ret;
> +   goto free_pdata;
> }
>
> /* init reset gpio */
> @@ -1275,7 +1275,7 @@ mcr20a_probe(struct spi_device *spi)
> ret = devm_gpio_request_one(>dev, pdata->rst_gpio,
> GPIOF_OUT_INIT_HIGH, "reset");
> if (ret)
> -   return ret;
> +   goto free_pdata;
> }
>
> /* reset mcr20a */
> @@ -1291,7 +1291,8 @@ mcr20a_probe(struct spi_device *spi)
> hw = ieee802154_alloc_hw(sizeof(*lp), _hw_ops);
> if (!hw) {
> dev_crit(>dev, "ieee802154_alloc_hw failed\n");
> -   return -ENOMEM;
> +   ret = -ENOMEM;
> +   goto free_pdata;
> }
>
> /* init mcr20a local data */
> @@ -1366,6 +1367,8 @@ mcr20a_probe(struct spi_device *spi)
>
>  free_dev:
> ieee802154_free_hw(lp->hw);
> +free_pdata:
> +   kfree(pdata);
>
> return ret;
>  }
> --
> 2.7.4
>

Re: [PATCH] ieee802154: mcr20a: Fix memory leak in mcr20a_probe

2018-04-10 Thread Xue Liu 
Hallo,

Thanks for the fix. It looks good.

ACK-by: Xue Liu 

On 5 April 2018 at 18:20, Gustavo A. R. Silva  wrote:
> Free allocated memory for pdata before return.
>
> Addresses-Coverity-ID: 1466096 ("Resource leak")
> Fixes: 8c6ad9cc5157 ("ieee802154: Add NXP MCR20A IEEE 802.15.4 transceiver 
> driver")
> Signed-off-by: Gustavo A. R. Silva 
> ---
>  drivers/net/ieee802154/mcr20a.c | 9 ++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
> index 55a22c7..944470d 100644
> --- a/drivers/net/ieee802154/mcr20a.c
> +++ b/drivers/net/ieee802154/mcr20a.c
> @@ -1267,7 +1267,7 @@ mcr20a_probe(struct spi_device *spi)
> ret = mcr20a_get_platform_data(spi, pdata);
> if (ret < 0) {
> dev_crit(>dev, "mcr20a_get_platform_data failed.\n");
> -   return ret;
> +   goto free_pdata;
> }
>
> /* init reset gpio */
> @@ -1275,7 +1275,7 @@ mcr20a_probe(struct spi_device *spi)
> ret = devm_gpio_request_one(>dev, pdata->rst_gpio,
> GPIOF_OUT_INIT_HIGH, "reset");
> if (ret)
> -   return ret;
> +   goto free_pdata;
> }
>
> /* reset mcr20a */
> @@ -1291,7 +1291,8 @@ mcr20a_probe(struct spi_device *spi)
> hw = ieee802154_alloc_hw(sizeof(*lp), _hw_ops);
> if (!hw) {
> dev_crit(>dev, "ieee802154_alloc_hw failed\n");
> -   return -ENOMEM;
> +   ret = -ENOMEM;
> +   goto free_pdata;
> }
>
> /* init mcr20a local data */
> @@ -1366,6 +1367,8 @@ mcr20a_probe(struct spi_device *spi)
>
>  free_dev:
> ieee802154_free_hw(lp->hw);
> +free_pdata:
> +   kfree(pdata);
>
> return ret;
>  }
> --
> 2.7.4
>