All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] genetlink: Fix a memory leak on error path
@ 2019-03-21  7:02 Yue Haibing
  2019-03-21  9:26 ` Kirill Tkhai
  2019-03-21 16:30 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Yue Haibing @ 2019-03-21  7:02 UTC (permalink / raw)
  To: davem, keescook, ktkhai; +Cc: linux-kernel, netdev, YueHaibing

From: YueHaibing <yuehaibing@huawei.com>

In genl_register_family(), when idr_alloc() fails,
we forget to free the memory we possibly allocate for
family->attrbuf.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 2ae0f17df1cd ("genetlink: use idr to track families")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/netlink/genetlink.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 25eeb6d..f0ec068 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -366,7 +366,7 @@ int genl_register_family(struct genl_family *family)
 			       start, end + 1, GFP_KERNEL);
 	if (family->id < 0) {
 		err = family->id;
-		goto errout_locked;
+		goto errout_free;
 	}
 
 	err = genl_validate_assign_mc_groups(family);
@@ -385,6 +385,7 @@ int genl_register_family(struct genl_family *family)
 
 errout_remove:
 	idr_remove(&genl_fam_idr, family->id);
+errout_free:
 	kfree(family->attrbuf);
 errout_locked:
 	genl_unlock_all();
-- 
2.7.0



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] genetlink: Fix a memory leak on error path
  2019-03-21  7:02 [PATCH] genetlink: Fix a memory leak on error path Yue Haibing
@ 2019-03-21  9:26 ` Kirill Tkhai
  2019-03-21 16:30 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Kirill Tkhai @ 2019-03-21  9:26 UTC (permalink / raw)
  To: Yue Haibing, davem, keescook; +Cc: linux-kernel, netdev

On 21.03.2019 10:02, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
> 
> In genl_register_family(), when idr_alloc() fails,
> we forget to free the memory we possibly allocate for
> family->attrbuf.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: 2ae0f17df1cd ("genetlink: use idr to track families")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>

> ---
>  net/netlink/genetlink.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
> index 25eeb6d..f0ec068 100644
> --- a/net/netlink/genetlink.c
> +++ b/net/netlink/genetlink.c
> @@ -366,7 +366,7 @@ int genl_register_family(struct genl_family *family)
>  			       start, end + 1, GFP_KERNEL);
>  	if (family->id < 0) {
>  		err = family->id;
> -		goto errout_locked;
> +		goto errout_free;
>  	}
>  
>  	err = genl_validate_assign_mc_groups(family);
> @@ -385,6 +385,7 @@ int genl_register_family(struct genl_family *family)
>  
>  errout_remove:
>  	idr_remove(&genl_fam_idr, family->id);
> +errout_free:
>  	kfree(family->attrbuf);
>  errout_locked:
>  	genl_unlock_all();
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] genetlink: Fix a memory leak on error path
  2019-03-21  7:02 [PATCH] genetlink: Fix a memory leak on error path Yue Haibing
  2019-03-21  9:26 ` Kirill Tkhai
@ 2019-03-21 16:30 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-03-21 16:30 UTC (permalink / raw)
  To: yuehaibing; +Cc: keescook, ktkhai, linux-kernel, netdev

From: Yue Haibing <yuehaibing@huawei.com>
Date: Thu, 21 Mar 2019 15:02:50 +0800

> From: YueHaibing <yuehaibing@huawei.com>
> 
> In genl_register_family(), when idr_alloc() fails,
> we forget to free the memory we possibly allocate for
> family->attrbuf.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: 2ae0f17df1cd ("genetlink: use idr to track families")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Applied and queued up for -stable, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-03-21 16:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-21  7:02 [PATCH] genetlink: Fix a memory leak on error path Yue Haibing
2019-03-21  9:26 ` Kirill Tkhai
2019-03-21 16:30 ` David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.