Commit 04bef83a authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: multicast: fix PIM hello router port marking race 



When a PIM hello packet is received on a bridge port with multicast
snooping enabled, we mark it as a router port automatically, that
includes adding that port the router port list. The multicast lock
protects that list, but it is not acquired in the PIM message case
leading to a race condition, we need to take it to fix the race.

Cc: stable@vger.kernel.org
Fixes: 91b02d3d ("bridge: mcast: add router port on PIM hello message")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5de4be0

net/bridge/br_multicast.c

+2 −0
Original line number Diff line number Diff line
@@ -3264,7 +3264,9 @@ static void br_multicast_pim(struct net_bridge *br, 
	    pim_hdr_type(pimhdr) != PIM_TYPE_HELLO)

		return;



	spin_lock(&br->multicast_lock);

	br_ip4_multicast_mark_router(br, port);

	spin_unlock(&br->multicast_lock);

}



static int br_ip4_multicast_mrd_rcv(struct net_bridge *br,