diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2010-11-15 07:38:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-15 20:13:17 +0100 |
| commit | b5ed54e94d324f17c97852296d61a143f01b227a (patch) | |
| tree | 2104d3cde24efc1145bc71beb4b61d79ed841132 /net/bridge/br_if.c | |
| parent | netdev: add rcu annotations to receive handler hook (diff) | |
| download | linux-b5ed54e94d324f17c97852296d61a143f01b227a.tar.xz linux-b5ed54e94d324f17c97852296d61a143f01b227a.zip | |
bridge: fix RCU races with bridge port
The macro br_port_exists() is not enough protection when only
RCU is being used. There is a tiny race where other CPU has cleared port
handler hook, but is bridge port flag might still be set.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 89ad25a76202..427f90a8ab7b 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -475,11 +475,8 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) { struct net_bridge_port *p; - if (!br_port_exists(dev)) - return -EINVAL; - p = br_port_get(dev); - if (p->br != br) + if (!p || p->br != br) return -EINVAL; del_nbp(p); |