Netdev List
 help / color / mirror / Atom feed
* [PATCH net 1/2] bridge: mcast: Fix source list rollback on failure
@ 2026-11-22  7:25 Ido Schimmel
  2026-11-22  7:25 ` [PATCH net 2/2] selftests: bridge_mdb: Test failed source list replace Ido Schimmel
  0 siblings, 1 reply; 2+ messages in thread
From: Ido Schimmel @ 2026-11-22  7:25 UTC (permalink / raw)
  To: netdev
  Cc: davem, kuba, pabeni, edumazet, willemb, horms, razor, dsahern,
	shuah, bridge, linux-kselftest, kyuwoncho18, Ido Schimmel, stable

When the bridge fails to add or replace an MDB entry with a source list,
br_mdb_add_group_srcs() rolls back the operation by looking up and
deleting the source entries of all the sources that were already
processed. This is wrong for two reasons.

First, with NLM_F_REPLACE, a source can appear more than once in the
source list. Its source entry is deleted when rolling back one
occurrence and the lookup fails for the other, triggering a
WARN_ON_ONCE() [1].

Second, when replacing an existing entry fails, sources from the new
source list that already existed before the replace are deleted together
with their (S, G) entries instead of being kept.

Fix by marking source entries that were created by the current operation
and only deleting them on failure.

[1]
WARNING: net/bridge/br_mdb.c:901 at br_mdb_add_group_srcs+0x310/0x440, CPU#10: repro/304
[...]
RIP: 0010:br_mdb_add_group_srcs (net/bridge/br_mdb.c:901 (discriminator 2) net/bridge/br_mdb.c:924 (discriminator 2))
[...]
Call Trace:
 <TASK>
 br_mdb_add_group_star_g (net/bridge/br_mdb.c:1021)
 br_mdb_add_group (net/bridge/br_mdb.c:1082)
 br_mdb_add (net/bridge/br_mdb.c:1097 net/bridge/br_mdb.c:1360)
 rtnl_mdb_add (net/core/rtnetlink.c:6925)
 rtnetlink_rcv_msg (net/core/rtnetlink.c:7178)
 [...]

Fixes: 61f2183512a7 ("bridge: mcast: Support replacement of MDB port group entries")
Cc: stable@vger.kernel.org
Reported-by: Kyuwon Cho <kyuwoncho18@gmail.com>
Closes: https://lore.kernel.org/netdev/179489219555.3099318.10297266282803881244@gmail.com/
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 net/bridge/br_mdb.c     | 29 ++++++++++++++---------------
 net/bridge/br_private.h |  1 +
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 0adcd1524ab2..be65976c2f32 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -867,6 +867,7 @@ static int br_mdb_add_group_src(const struct br_mdb_config *cfg,
 			NL_SET_ERR_MSG_MOD(extack, "Failed to add new source entry");
 			return -ENOSPC;
 		}
+		ent->flags |= BR_SGRP_F_NEW;
 	} else if (!(cfg->nlflags & NLM_F_REPLACE)) {
 		NL_SET_ERR_MSG_MOD(extack, "Source entry already exists");
 		return -EEXIST;
@@ -883,31 +884,24 @@ static int br_mdb_add_group_src(const struct br_mdb_config *cfg,
 	if (err)
 		goto err_del_sg;
 
-	ent->flags = BR_SGRP_F_INSTALLED | BR_SGRP_F_USER_ADDED;
+	ent->flags = BR_SGRP_F_INSTALLED | BR_SGRP_F_USER_ADDED |
+		     (ent->flags & BR_SGRP_F_NEW);
 
 	return 0;
 
 err_del_sg:
-	__br_multicast_del_group_src(ent);
+	if (ent->flags & BR_SGRP_F_NEW)
+		__br_multicast_del_group_src(ent);
 	return err;
 }
 
-static void br_mdb_del_group_src(struct net_bridge_port_group *pg,
-				 struct br_mdb_src_entry *src)
-{
-	struct net_bridge_group_src *ent;
-
-	ent = br_multicast_find_group_src(pg, &src->addr);
-	if (WARN_ON_ONCE(!ent))
-		return;
-	br_multicast_del_group_src(ent, false);
-}
-
 static int br_mdb_add_group_srcs(const struct br_mdb_config *cfg,
 				 struct net_bridge_port_group *pg,
 				 struct net_bridge_mcast *brmctx,
 				 struct netlink_ext_ack *extack)
 {
+	struct net_bridge_group_src *ent;
+	struct hlist_node *tmp;
 	int i, err;
 
 	for (i = 0; i < cfg->num_src_entries; i++) {
@@ -917,11 +911,16 @@ static int br_mdb_add_group_srcs(const struct br_mdb_config *cfg,
 			goto err_del_group_srcs;
 	}
 
+	hlist_for_each_entry(ent, &pg->src_list, node)
+		ent->flags &= ~BR_SGRP_F_NEW;
+
 	return 0;
 
 err_del_group_srcs:
-	for (i--; i >= 0; i--)
-		br_mdb_del_group_src(pg, &cfg->src_entries[i]);
+	hlist_for_each_entry_safe(ent, tmp, &pg->src_list, node) {
+		if (ent->flags & BR_SGRP_F_NEW)
+			br_multicast_del_group_src(ent, false);
+	}
 	return err;
 }
 
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 014d0b8db8c7..97ad9d7bab27 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -347,6 +347,7 @@ struct net_bridge_fdb_flush_desc {
 #define BR_SGRP_F_SEND		BIT(1)
 #define BR_SGRP_F_INSTALLED	BIT(2)
 #define BR_SGRP_F_USER_ADDED	BIT(3)
+#define BR_SGRP_F_NEW		BIT(4)
 
 struct net_bridge_mcast_gc {
 	struct hlist_node		gc_node;
-- 
2.56.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-22  7:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-22  7:25 [PATCH net 1/2] bridge: mcast: Fix source list rollback on failure Ido Schimmel
2026-11-22  7:25 ` [PATCH net 2/2] selftests: bridge_mdb: Test failed source list replace Ido Schimmel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox