4.14-stable patches

added patches:
	net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch

diff --git a/queue-4.14/net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch b/queue-4.14/net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch
new file mode 100644 (file)
index 0000000..2dff88d
--- /dev/null
+++ b/queue-4.14/net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch
@@ -0,0 +1,36 @@
+From 04bef83a3358946bfc98a5ecebd1b0003d83d882 Mon Sep 17 00:00:00 2001
+From: Nikolay Aleksandrov <nikolay@nvidia.com>
+Date: Sun, 11 Jul 2021 12:56:28 +0300
+Subject: net: bridge: multicast: fix PIM hello router port marking race
+
+From: Nikolay Aleksandrov <nikolay@nvidia.com>
+
+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 |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -1763,7 +1763,9 @@ static void br_multicast_pim(struct net_
+           pim_hdr_type(pimhdr) != PIM_TYPE_HELLO)
+               return;
+ 
++      spin_lock(&br->multicast_lock);
+       br_multicast_mark_router(br, port);
++      spin_unlock(&br->multicast_lock);
+ }
+ 
+ static int br_multicast_ipv4_rcv(struct net_bridge *br,

diff --git a/queue-4.14/series b/queue-4.14/series
index 93e49dc60858d27cc49a94e084c00a91a7fbd1fb..58cf2d435aa8c3b59c63674eb1a760cc4617bff0 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -312,3 +312,4 @@ scsi-be2iscsi-fix-an-error-handling-path-in-beiscsi_.patch
 mips-always-link-byteswap-helpers-into-decompressor.patch
 mips-disable-branch-profiling-in-boot-decompress.o.patch
 mips-vdso-invalid-gic-access-through-vdso.patch
+net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch