public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] veth: Fix potential memory leak in veth_newlink
@ 2016-04-27 10:42 Haishuang Yan
  2016-04-27 10:57 ` Nikolay Aleksandrov
  0 siblings, 1 reply; 2+ messages in thread
From: Haishuang Yan @ 2016-04-27 10:42 UTC (permalink / raw)
  To: David S. Miller, Toshiaki Makita; +Cc: netdev, linux-kernel, Haishuang Yan

Free peer netdev when failed to configure peer link or register dev.

Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
 drivers/net/veth.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index f37a6e6..8bb9fb8 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -472,7 +472,6 @@ err_register_dev:
 	/* nothing to do */
 err_configure_peer:
 	unregister_netdevice(peer);
-	return err;
 
 err_register_peer:
 	free_netdev(peer);
-- 
1.8.3.1

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

* Re: [PATCH] veth: Fix potential memory leak in veth_newlink
  2016-04-27 10:42 [PATCH] veth: Fix potential memory leak in veth_newlink Haishuang Yan
@ 2016-04-27 10:57 ` Nikolay Aleksandrov
  0 siblings, 0 replies; 2+ messages in thread
From: Nikolay Aleksandrov @ 2016-04-27 10:57 UTC (permalink / raw)
  To: Haishuang Yan, David S. Miller, Toshiaki Makita; +Cc: netdev, linux-kernel

On 04/27/2016 12:42 PM, Haishuang Yan wrote:
> Free peer netdev when failed to configure peer link or register dev.
> 
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
> ---
>  drivers/net/veth.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/veth.c b/drivers/net/veth.c
> index f37a6e6..8bb9fb8 100644
> --- a/drivers/net/veth.c
> +++ b/drivers/net/veth.c
> @@ -472,7 +472,6 @@ err_register_dev:
>  	/* nothing to do */
>  err_configure_peer:
>  	unregister_netdevice(peer);
> -	return err;
>  
>  err_register_peer:
>  	free_netdev(peer);
> 

No, it won't leak. unregister_netdevice() will queue it on the todo list and at
the next rtnl unlock the peer device will get freed.
In fact calling it like this you'll hit BUG_ON(dev->reg_state != NETREG_UNREGISTERED) in
free_netdev so I guess you didn't even test your patch.

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

end of thread, other threads:[~2016-04-27 10:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-27 10:42 [PATCH] veth: Fix potential memory leak in veth_newlink Haishuang Yan
2016-04-27 10:57 ` Nikolay Aleksandrov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox