From: Greg Kroah-Hartman Date: Mon, 19 Jul 2021 13:20:52 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.13.4~30 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0032ef09932ad4ad5799456345f35d8b3bfa2841;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: net-bridge-multicast-fix-mrd-advertisement-router-port-marking-race.patch net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch --- diff --git a/queue-5.10/net-bridge-multicast-fix-mrd-advertisement-router-port-marking-race.patch b/queue-5.10/net-bridge-multicast-fix-mrd-advertisement-router-port-marking-race.patch new file mode 100644 index 00000000000..f6678f7a16e --- /dev/null +++ b/queue-5.10/net-bridge-multicast-fix-mrd-advertisement-router-port-marking-race.patch @@ -0,0 +1,47 @@ +From 000b7287b67555fee39d39fff75229dedde0dcbf Mon Sep 17 00:00:00 2001 +From: Nikolay Aleksandrov +Date: Sun, 11 Jul 2021 12:56:29 +0300 +Subject: net: bridge: multicast: fix MRD advertisement router port marking race + +From: Nikolay Aleksandrov + +commit 000b7287b67555fee39d39fff75229dedde0dcbf upstream. + +When an MRD advertisement is received on a bridge port with multicast +snooping enabled, we mark it as a router port automatically, that +includes adding that port to the router port list. The multicast lock +protects that list, but it is not acquired in the MRD advertisement case +leading to a race condition, we need to take it to fix the race. + +Cc: stable@vger.kernel.org +Cc: linus.luessing@c0d3.blue +Fixes: 4b3087c7e37f ("bridge: Snoop Multicast Router Advertisements") +Signed-off-by: Nikolay Aleksandrov +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/bridge/br_multicast.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/net/bridge/br_multicast.c ++++ b/net/bridge/br_multicast.c +@@ -3011,7 +3011,9 @@ static int br_ip4_multicast_mrd_rcv(stru + igmp_hdr(skb)->type != IGMP_MRDISC_ADV) + return -ENOMSG; + ++ spin_lock(&br->multicast_lock); + br_multicast_mark_router(br, port); ++ spin_unlock(&br->multicast_lock); + + return 0; + } +@@ -3079,7 +3081,9 @@ static void br_ip6_multicast_mrd_rcv(str + if (icmp6_hdr(skb)->icmp6_type != ICMPV6_MRDISC_ADV) + return; + ++ spin_lock(&br->multicast_lock); + br_multicast_mark_router(br, port); ++ spin_unlock(&br->multicast_lock); + } + + static int br_multicast_ipv6_rcv(struct net_bridge *br, diff --git a/queue-5.10/net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch b/queue-5.10/net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch new file mode 100644 index 00000000000..c69d6c97fe9 --- /dev/null +++ b/queue-5.10/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 +@@ -2998,7 +2998,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_ip4_multicast_mrd_rcv(struct net_bridge *br, diff --git a/queue-5.10/series b/queue-5.10/series index 3c719e81c41..a20e6e101f4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -17,3 +17,5 @@ drm-dp_mst-add-missing-drm-parameters-to-recently-added-call-to-drm_dbg_kms.patc drm-ingenic-fix-non-osd-mode.patch drm-ingenic-switch-ipu-plane-to-type-overlay.patch revert-drm-ast-remove-reference-to-struct-drm_device.pdev.patch +net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch +net-bridge-multicast-fix-mrd-advertisement-router-port-marking-race.patch