Skip to contentSkip to conversation

net: dsa: mt7530: fix VLAN traffic leaks again

PATCH In review DENG Qingfang 2 participants 2 messages Aug 23, 2021 – Sep 1, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: dsa: mt7530: fix VLAN traffic leaks again

[ Upstream commit 7428022b50d0fbb4846dd0f00639ea09d36dff02 ]

When a port leaves a VLAN-aware bridge, the current code does not clear other ports' matrix field bit. If the bridge is later set to VLAN-unaware mode, traffic in the bridge may leak to that port.

Remove the VLAN filtering check in mt7530_port_bridge_leave.

Fixes 4fe4e1f48ba1 ("net: dsa: mt7530: fix VLAN traffic leaks")
Fixes 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
---
 drivers/net/dsa/mt7530.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/dsa/mt7530.c +1 -4
index aec606058d98..fc45af12612f 100644
@@ -840,11 +840,8 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port,
 		/* Remove this port from the port matrix of the other ports
 		 * in the same bridge. If the port is disabled, port matrix
 		 * is kept and not being setup until the port becomes enabled.
-		 * And the other port's port matrix cannot be broken when the
-		 * other port is still a VLAN-aware port.
 		 */
-		if (dsa_is_user_port(ds, i) && i != port &&
-		   !dsa_port_is_vlan_filtering(&ds->ports[i])) {
+		if (dsa_is_user_port(ds, i) && i != port) {
 			if (dsa_to_port(ds, i)->bridge_dev != bridge)
 				continue;
 			if (priv->ports[i].enable)
Signature · 1 line
2.25.1
#1 lore raw
Quoted 8 lines · DENG Qingfang

[ Upstream commit 7428022b50d0fbb4846dd0f00639ea09d36dff02 ]

When a port leaves a VLAN-aware bridge, the current code does not clear other ports' matrix field bit. If the bridge is later set to VLAN-unaware mode, traffic in the bridge may leak to that port.

Remove the VLAN filtering check in mt7530_port_bridge_leave.

Quoted 8 lines
Fixes 4fe4e1f48ba1 ("net: dsa: mt7530: fix VLAN traffic leaks")
Fixes 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
---
 drivers/net/dsa/mt7530.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Now queued up, thanks.

greg k-h