From: Greg Kroah-Hartman Date: Mon, 19 Jul 2021 13:37:21 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v5.13.4~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2b2ac89aef25e8000adf5d959acff0cd582275b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch --- diff --git a/queue-4.19/net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch b/queue-4.19/net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch new file mode 100644 index 00000000000..3dc55bb9649 --- /dev/null +++ b/queue-4.19/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 +@@ -1791,7 +1791,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.19/series b/queue-4.19/series index 1fead9ba1b0..0c1634f67ca 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -417,3 +417,4 @@ mips-always-link-byteswap-helpers-into-decompressor.patch mips-disable-branch-profiling-in-boot-decompress.o.patch perf-report-fix-task-and-stat-with-pipe-input.patch mips-vdso-invalid-gic-access-through-vdso.patch +net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch