net: bridge: multicast: fix PIM hello router port marking race
authorNikolay Aleksandrov <nikolay@nvidia.com>
Sun, 11 Jul 2021 09:56:28 +0000 (12:56 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:05:37 +0000 (16:05 +0200)
commit664cc645bdd8ce3f000a5bec0eee0c7289395c27
treed09e771b97c17e8c79c30eb49c4e115305312cc9
parentb3aea76efe90d7676e6965fe2f017d7ffc128b37
net: bridge: multicast: fix PIM hello router port marking race

commit 04bef83a3358946bfc98a5ecebd1b0003d83d882 upstream.

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: 91b02d3d133b ("bridge: mcast: add router port on PIM hello message")
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/bridge/br_multicast.c