bridge: fix locking and memory leak in br_add_bridge
Subsystems (3)
PATCH 1/1 bridge: fix locking and memory leak in br_add_bridge
There are several problems in error handling in br_add_bridge:
- when dev_alloc_name fails, allocated net_device is not freed
- unregister_netdev is called when rtnl lock is held
- free_netdev is called before netdev_run_todo has a chance to be run after unregistering net_device
This patch should fix these issues.
---
net/bridge/br_if.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
net/bridge/br_if.c +4 -5
@@ -306,20 +306,19 @@ int br_add_bridge(const char *name) ret =register_netdevice (dev);if (ret) - goto err2; + goto err1; ret =br_sysfs_addbr (dev);if (ret) - goto err3; + goto err2;rtnl_unlock ();return 0 ; - err3: -unregister_netdev (dev); err2: -free_netdev (dev); +unregister_netdevice (dev); err1:rtnl_unlock (); +free_netdev (dev);return ret; }
Signature · 2 lines
Jiri Benc SUSE Labs
net/bridge/br_if.c int br_add_bridge(const char *name) · line 322
Quoted 7 lines · Jiri Benc
err2:
net/bridge/br_if.c +2
-1-free_netdev (dev); +unregister_netdevice (dev); err1:rtnl_unlock (); +free_netdev (dev);return ret;
Sorry, this is wrong. I didn't notice that br_dev_setup sets dev->destructor to free_netdev. Corrected patch will follow.
Jiri
Signature · 2 lines
Jiri Benc SUSE Labs
PATCH v2 1/1 bridge: fix locking and memory leak in br_add_bridge
There are several bugs in error handling in br_add_bridge:
- when dev_alloc_name fails, allocated net_device is not freed
- unregister_netdev is called when rtnl lock is held
- free_netdev is called before netdev_run_todo has a chance to be run after unregistering net_device
This patch should fix these issues.
---
net/bridge/br_if.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-)
net/bridge/br_if.c +6 -9
@@ -301,25 +301,22 @@ int br_add_bridge(const char *name)if (strchr (dev->name,'%' )) { ret =dev_alloc_name (dev, dev->name);if (ret <0 ) - goto err1; + goto err; } ret =register_netdevice (dev);if (ret) - goto err2; + goto err; ret =br_sysfs_addbr (dev);if (ret) - goto err3; +unregister_netdevice (dev);rtnl_unlock (); -return 0 ; +return ret; - err3: -unregister_netdev (dev); - err2: -free_netdev (dev); - err1: + err:rtnl_unlock (); +free_netdev (dev);return ret; }
Signature · 2 lines
Jiri Benc SUSE Labs
There are several bugs in error handling in br_add_bridge:
- when dev_alloc_name fails, allocated net_device is not freed
- unregister_netdev is called when rtnl lock is held
- free_netdev is called before netdev_run_todo has a chance to be run after unregistering net_device
This patch should fix these issues.
Minor rearrangement of to use common path of earlier patch. Dave please apply.
net/bridge/br_if.c +6 -11
@@ -301,25 +301,20 @@ int br_add_bridge(const char *name)if (strchr (dev->name,'%' )) { ret =dev_alloc_name (dev, dev->name);if (ret <0 ) - goto err1; + goto err; } ret =register_netdevice (dev);if (ret) - goto err2; + goto err; ret =br_sysfs_addbr (dev);if (ret) - goto err3; -rtnl_unlock (); -return 0 ; - - err3: -unregister_netdev (dev); - err2: -free_netdev (dev); - err1: +unregister_netdevice (dev); + err:rtnl_unlock (); +if (ret) +free_netdev (dev);return ret; }
net/bridge/br_if.c int br_add_bridge(const char *name) · line 318
Quoted 6 lines · Stephen Hemminger
net/bridge/br_if.c +4
-0+unregister_netdevice (dev); + err:rtnl_unlock (); +if (ret) +free_netdev (dev);return ret;
I don't think this is correct. netdev_run_todo calls dev->destructor which is set to free_netdev by br_dev_setup. So you're calling free_netdev on already freed device.
Jiri
Signature · 2 lines
Jiri Benc SUSE Labs
David Miller
maintainerFrom: Jiri Benc <[email protected]>
Date: Fri, 26 May 2006 11:08:06 +0200
Quoted 11 lines · Stephen Hemminger
net/bridge/br_if.c int br_add_bridge(const char *name) · line 318
Quoted 6 lines
net/bridge/br_if.c +4
-0+unregister_netdevice (dev); + err:rtnl_unlock (); +if (ret) +free_netdev (dev);return ret;I don't think this is correct.
netdev_run_todocallsdev->destructorwhich is set tofree_netdevbybr_dev_setup. So you're callingfree_netdevon already freed device.
Right, we need a more correct version of this bug fix. :)
Fri, 26 May 2006 19:26:11 -0700 (PDT), David Miller pise:
Quoted 7 lines
From: Jiri Benc <[email protected]>
Date: Fri, 26 May 2006 11:08:06 +0200Quoted 3 lines
I don't think this is correct.
netdev_run_todocallsdev->destructorwhich is set tofree_netdevbybr_dev_setup. So you're callingfree_netdevon already freed device.Right, we need a more correct version of this bug fix. :)
I think the second version I sent
(http://www.spinics.net/lists/netdev/msg05111.html) should be correct.
Jiri
Signature · 2 lines
Jiri Benc SUSE Labs
PATCH v3 1/1 bridge: fix locking and memory leak in br_add_bridge
In reply to David MillerThere are several bugs in error handling in br_add_bridge:
- when dev_alloc_name fails, allocated net_device is not freed
- unregister_netdev is called when rtnl lock is held
- free_netdev is called before netdev_run_todo has a chance to be run after unregistering net_device
net/bridge/br_if.c +7 -12
@@ -300,25 +300,20 @@ int br_add_bridge(const char *name)rtnl_lock ();if (strchr (dev->name,'%' )) { ret =dev_alloc_name (dev, dev->name); -if (ret <0 ) - goto err1; +if (ret <0 ) { +free_netdev (dev); + goto out; + } } ret =register_netdevice (dev);if (ret) - goto err2; + goto out; ret =br_sysfs_addbr (dev);if (ret) - goto err3; -rtnl_unlock (); -return 0 ; - - err3: -unregister_netdev (dev); - err2: -free_netdev (dev); - err1: +unregister_netdevice (dev); + out:rtnl_unlock ();return ret; }
From: Stephen Hemminger <[email protected]>
Date: Sat, 27 May 2006 09:45:28 -0700
Quoted 8 lines
There are several bugs in error handling in
br_add_bridge:
- whendev_alloc_namefails, allocatednet_deviceis not freed
-unregister_netdevis called when rtnl lock is held
-free_netdevis called beforenetdev_run_todohas a chance to be run after unregisteringnet_deviceSigned-off-by Jiri Benc <[email protected]>Signed-off-by Stephen Hemminger <[email protected]>
Applied, thanks a lot.