Commit 620681d7 authored Aug 11, 2021 by DENG Qingfang Committed by Greg Kroah-Hartman Sep 03, 2021

net: dsa: mt7530: fix VLAN traffic leaks again



commit 7428022b50d0fbb4846dd0f00639ea09d36dff02 upstream.

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: 474a2ddaa192 ("net: dsa: mt7530: fix VLAN traffic leaks")
Fixes: 83163f7d ("net: dsa: mediatek: add VLAN support for MT7530")
Signed-off-by: DENG Qingfang <dqfext@gmail.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 38adbf21

drivers/net/dsa/mt7530.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -842,11 +842,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)