[PATCH] net: hns3: Fix a memory leak in an error handling path in 'hclge_handle_error_info_log()'

[PATCH] net: hns3: Fix a memory leak in an error handling path in 'hclge_handle_error_info_log()'

[Christophe JAILLET]

If this 'kzalloc()' fails we must free some resources as in all the other
error handling paths of this function.

Fixes: 2e2deee7618b ("net: hns3: add the RAS compatibility adaptation solution")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
index bad9fda19398..ec9a7f8bc3fe 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
@@ -2330,8 +2330,10 @@ int hclge_handle_error_info_log(struct hnae3_ae_dev *ae_dev)
 	buf_size = buf_len / sizeof(u32);
 
 	desc_data = kzalloc(buf_len, GFP_KERNEL);
-	if (!desc_data)
-		return -ENOMEM;
+	if (!desc_data) {
+		ret = -ENOMEM;
+		goto err_desc;
+	}
 
 	buf = kzalloc(buf_len, GFP_KERNEL);
 	if (!buf) {
-- 
2.30.2

Re: [PATCH] net: hns3: Fix a memory leak in an error handling path in 'hclge_handle_error_info_log()'

[zhangjiaran]

在 2021/6/20 17:49, Christophe JAILLET 写道:
> If this 'kzalloc()' fails we must free some resources as in all the other
> error handling paths of this function.
> 
> Fixes: 2e2deee7618b ("net: hns3: add the RAS compatibility adaptation solution")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
> index bad9fda19398..ec9a7f8bc3fe 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
> @@ -2330,8 +2330,10 @@ int hclge_handle_error_info_log(struct hnae3_ae_dev *ae_dev)
>  	buf_size = buf_len / sizeof(u32);
>  
>  	desc_data = kzalloc(buf_len, GFP_KERNEL);
> -	if (!desc_data)
> -		return -ENOMEM;
> +	if (!desc_data) {
> +		ret = -ENOMEM;
> +		goto err_desc;
> +	}
>  
>  	buf = kzalloc(buf_len, GFP_KERNEL);
>  	if (!buf) {
> 

Reviewed-by: Jiaran Zhang <zhangjiaran@huawei.com>

Re: [PATCH] net: hns3: Fix a memory leak in an error handling path in 'hclge_handle_error_info_log()'

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Sun, 20 Jun 2021 11:49:40 +0200 you wrote:
> If this 'kzalloc()' fails we must free some resources as in all the other
> error handling paths of this function.
> 
> Fixes: 2e2deee7618b ("net: hns3: add the RAS compatibility adaptation solution")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Here is the summary with links:
  - net: hns3: Fix a memory leak in an error handling path in 'hclge_handle_error_info_log()'
    https://git.kernel.org/netdev/net-next/c/b40d7af798a0

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html