From 3c0033508e671db72057cfdb535c530423e3b44f Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 23 Feb 2025 13:38:13 +0100 Subject: bridge: T7192: fix verify() to not allow member interface used multiple times When configuring set interfaces bridge br10 member interface eth1 set interfaces bridge br20 member interface eth1 commit Checking the interface assignment afterwards shows 242: br20: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 link/ether 62:34:3a:8a:fe:49 brd ff:ff:ff:ff:ff:ff [edit] 3: eth1: mtu 1500 qdisc fq_codel master br20 state UP mode DEFAULT group default qlen 1000 link/ether 00:50:56:b3:cd:ba brd ff:ff:ff:ff:ff:ff altname enp0s19 altname ens19 The later addition wins and the CLI reports eth1 is assigned to br20 "master br20". A member interface can not be used multiple times. --- src/conf_mode/interfaces_bridge.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/conf_mode') diff --git a/src/conf_mode/interfaces_bridge.py b/src/conf_mode/interfaces_bridge.py index 637db442a..aff93af2a 100755 --- a/src/conf_mode/interfaces_bridge.py +++ b/src/conf_mode/interfaces_bridge.py @@ -74,8 +74,9 @@ def get_config(config=None): for interface in list(bridge['member']['interface']): # Check if member interface is already member of another bridge tmp = is_member(conf, interface, 'bridge') - if tmp and bridge['ifname'] not in tmp: - bridge['member']['interface'][interface].update({'is_bridge_member' : tmp}) + if ifname in tmp: + del tmp[ifname] + if tmp: bridge['member']['interface'][interface].update({'is_bridge_member' : tmp}) # Check if member interface is already member of a bond tmp = is_member(conf, interface, 'bonding') -- cgit v1.2.3