diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-04-27 11:01:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-27 21:13:54 -0400 |
commit | 83f6a740b4e52f88e312223df2fc94016a208618 (patch) | |
tree | 7cb24cc5a3a5779fe3dd9fbba3351cac19062b1f /net/bridge/br_multicast.c | |
parent | 168d40ee3d147ae20860e7916bd79b636cbe8fd5 (diff) |
bridge: multicast port group RCU fix
The recently introduced bridge mulitcast port group list was only
partially using RCU correctly. It was missing rcu_dereference()
and missing the necessary barrier on deletion.
The code should have used one of the standard list methods (list or hlist)
instead of open coding a RCU based link list.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_multicast.c')
-rw-r--r-- | net/bridge/br_multicast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index d63868c9b2c0..7128abdce45f 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
@@ -259,7 +259,7 @@ static void br_multicast_del_pg(struct net_bridge *br, | |||
259 | if (p != pg) | 259 | if (p != pg) |
260 | continue; | 260 | continue; |
261 | 261 | ||
262 | *pp = p->next; | 262 | rcu_assign_pointer(*pp, p->next); |
263 | hlist_del_init(&p->mglist); | 263 | hlist_del_init(&p->mglist); |
264 | del_timer(&p->timer); | 264 | del_timer(&p->timer); |
265 | del_timer(&p->query_timer); | 265 | del_timer(&p->query_timer); |