From: Greg Kroah-Hartman Date: Mon, 19 Jul 2021 13:37:03 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.13.4~28 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc26aefa90ed6bac8799d6c699eb5cf17bea114d;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..2dff88df395 --- /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 +Date: Sun, 11 Jul 2021 12:56:28 +0300 +Subject: net: bridge: multicast: fix PIM hello router port marking race + +From: Nikolay Aleksandrov + +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 +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + 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 93e49dc6085..58cf2d435aa 100644 --- 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