Commit 7428022b authored by DENG Qingfang's avatar DENG Qingfang Committed by David S. Miller
Browse files

net: dsa: mt7530: fix VLAN traffic leaks again 



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: 474a2dda ("net: dsa: mt7530: fix VLAN traffic leaks")
Fixes: 83163f7d ("net: dsa: mediatek: add VLAN support for MT7530")
Signed-off-by: default avatarDENG Qingfang <dqfext@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0ba6050

drivers/net/dsa/mt7530.c

+1 −4
Original line number Diff line number Diff line
@@ -1315,11 +1315,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(dsa_to_port(ds, 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)