Messages in this thread Patch in this message | | | Date | Tue, 13 Dec 2005 13:59:54 -0800 | From | Greg Kroah-Hartman <> | Subject | [patch 2/2] [PATCH] br: fix race on bridge del if |
| |
-stable review patch. If anyone has any objections, please let us know.
------------------ From: Stephen Hemminger <shemminger@osdl.org>
This fixes the RCU race on bridge delete interface. Basically, the network device has to be detached from the bridge in the first step (pre-RCU), rather than later. At that point, no more bridge traffic will come in, and the other code will not think that network device is part of a bridge.
This should also fix the XEN test problems. If there is another 2.6.13-stable, add it as well.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/bridge/br_if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.13.4.orig/net/bridge/br_if.c +++ linux-2.6.13.4/net/bridge/br_if.c @@ -79,7 +79,6 @@ static void destroy_nbp(struct net_bridg { struct net_device *dev = p->dev; - dev->br_port = NULL; p->br = NULL; p->dev = NULL; dev_put(dev); @@ -100,6 +99,7 @@ static void del_nbp(struct net_bridge_po struct net_bridge *br = p->br; struct net_device *dev = p->dev; + dev->br_port = NULL; dev_set_promiscuity(dev, -1); spin_lock_bh(&br->lock); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |