bridge: fix multicast router rlist endless loop
authorNikolay Aleksandrov <razor@blackwall.org>
Tue, 9 Jun 2015 17:23:57 +0000 (10:23 -0700)
committerJiri Slaby <jslaby@suse.cz>
Thu, 30 Jul 2015 12:10:36 +0000 (14:10 +0200)
commit07cde7c20c9fd0ea3e9177db017dce03c60dcd42
treeaf9c344c4a4177061519d987fa569343c870dbb5
parent6b4086dc645491f3df0f5bc7b49cf9dccd827801
bridge: fix multicast router rlist endless loop

[ Upstream commit 1a040eaca1a22f8da8285ceda6b5e4a2cb704867 ]

Since the addition of sysfs multicast router support if one set
multicast_router to "2" more than once, then the port would be added to
the hlist every time and could end up linking to itself and thus causing an
endless loop for rlist walkers.
So to reproduce just do:
echo 2 > multicast_router; echo 2 > multicast_router;
in a bridge port and let some igmp traffic flow, for me it hangs up
in br_multicast_flood().
Fix this by adding a check in br_multicast_add_router() if the port is
already linked.
The reason this didn't happen before the addition of multicast_router
sysfs entries is because there's a !hlist_unhashed check that prevents
it.

Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org>
Fixes: 0909e11758bd ("bridge: Add multicast_router sysfs entries")
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/bridge/br_multicast.c