From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792774190; b=bMq5jvjxkeS9mc9oEZxV7ktjsZWrYQ4PaN2Dus581e2klbsuZua9TwOeJIRS+vPkD276 VW9645VG5th5/pHU5+gqEXDixrME9UwYnsPGNCMRccrlGZ4ez5fE9mFT0+zfoPS97gM7j +7qK4mmfAgP50wx9uqtgocDXO0nWKdabndjN61Dqmit697SMDu+y7zyiNMLqOd49q0UaR XWurWgdAXyE9LlLwKW4/KZvJwIT01hIbBdJnUBupig9KGeUTUnoeDyHfRMgbPeZZgmCOL s2HBT7X0GSmNPFmlKkknwAUR2d3W7spHIm1qV2FW7H+3Zjn/CW7wLLperJRlL/IdYEg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792774190; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=rJD4t5wLcR6b3u9FbDswwuC6tA3O8+Mmu5Vsgvyc+uQ=; b=ElDe4biI7LwvPaShyuyO2cEhrS6lTz9i2I69m8Z7lYkwGu2bwuqlJA/cikSv0G9+GlxE Mobvpq+V58rw8AxeVKuI+yF/PDiu4qr8/pXC8uSp1EVOjEfCzzxzoV8SMgTKBM14Ty5os /gbxGuFZQHe1S4dxunDXMtANPcPNsFliUkoP1PSVpDGY4OG7FBqe82lCvdB+dRasEydgN ZqEuLaGR8HmzaOioPinRUdNcaOs36vyUihscfxnh0wDqC2B43UN/1JBHHxDr9sNkcEzcM f1ZfAK4yZBYhsy7YGGoQgGC7ci5a2gR60a4nN0imrxk9nh2/YzCHN0QbmcFoTfFBNrw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=XanzXddb; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1760A60A2607; Fri, 23 Oct 2026 16:49:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=XanzXddb Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6948E1F01829; Fri, 23 Oct 2026 16:49:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792774190; bh=rJD4t5wLcR6b3u9FbDswwuC6tA3O8+Mmu5Vsgvyc+uQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XanzXddb+1o9uZFC50q3BoDWNRxjQgYdwusZ5bqeGDDZ9zjUbecl4V9NHCBh/s6bS QytJC7s0CbYIsBWbaEfydNQysC8sb37kSIT99Ytmo9APdpFh8Z7b5jD4/PhIqLyx4u hv3Stwsxcs35zusYqIkErRNExXNRhjpdFmIQfnx0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nikolay Aleksandrov , TencentOS Corvus AI , Jun Yang , Jakub Kicinski Subject: [PATCH 6.18 152/193] net: bridge: mcast: dont truncate the port group walk on teardown Date: Fri, 23 Oct 2026 18:37:09 +0200 Message-ID: <20261023163717.807483398@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261023163714.201276352@linuxfoundation.org> References: <20261023163714.201276352@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jun Yang commit 5a3f7a683aee56e1f15c9d53041f3236767eaae7 upstream. __br_multicast_disable_port_ctx() and br_multicast_del_port() walk port->mglist with hlist_for_each_entry_safe(). However, br_multicast_find_del_pg() can also delete other entries from the same list through br_multicast_fwd_src_remove() or __fwd_del_star_excl(). If such an entry is the iterator's saved next node, hlist_del_init() clears its ->next and terminates the walk early. The reproducer triggers this in both teardown walks, leaving port groups in the bridge mdb with a dangling ->key.port after del_nbp() frees the port: BUG: KASAN: slab-use-after-free in __mdb_fill_info+0x1191/0x1320 __mdb_fill_info+0x1191/0x1320 br_mdb_dump+0x594/0xe40 rtnl_mdb_dump+0x1cf/0x5d0 Use hlist_del_init_rcu() to unlink the group while preserving ->next. br_multicast_del_pg() and the teardown walks run under br->multicast_lock. The GC worker must acquire the same lock before detaching the group for destruction, so the node remains alive while the walk uses the preserved pointer. Preserving ->next means a walk can now reach a group that an earlier iteration already deleted as a side effect. That group is off mp->ports, so br_multicast_find_del_pg() would fall through its port scan and hit the trailing WARN_ON(1). Skip such groups at the top of that helper: a port group is put on port->mglist when it is created and only unlinked when it is deleted, so hlist_unhashed() identifies exactly this case. Fixes: b08123684bd5 ("net: bridge: mcast: install S,G entries automatically based on reports") Cc: stable@vger.kernel.org Suggested-by: Nikolay Aleksandrov Reported-by: TencentOS Corvus AI Signed-off-by: Jun Yang Reviewed-by: Nikolay Aleksandrov Link: https://patch.msgid.link/20260831111330.199543-1-junvyyang@tencent.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_multicast.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -813,7 +813,11 @@ static void __br_multicast_del_pg(struct struct hlist_node *tmp; rcu_assign_pointer(*pp, pg->next); - hlist_del_init(&pg->mglist); + /* Keep ->next (held under multicast_lock, freed later by the GC work): + * a port->mglist teardown walk may have latched this node as its next, + * and deleting other groups of the same port must not truncate it. + */ + hlist_del_init_rcu(&pg->mglist); br_multicast_eht_clean_sets(pg); hlist_for_each_entry_safe(ent, tmp, &pg->src_list, node) br_multicast_del_group_src(ent, false); @@ -848,6 +852,13 @@ static void br_multicast_find_del_pg(str struct net_bridge_mdb_entry *mp; struct net_bridge_port_group *p; + /* A teardown walk over port->mglist can reach a group that an earlier + * iteration already deleted as a side effect. It is off mp->ports by + * now, so skip it instead of falling through to the WARN_ON() below. + */ + if (hlist_unhashed(&pg->mglist)) + return; + mp = br_mdb_ip_get(br, &pg->key.addr); if (WARN_ON(!mp)) return;