Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae389812 authored by DENG Qingfang's avatar DENG Qingfang Committed by Greg Kroah-Hartman
Browse files

net: dsa: mt7530: fix VLAN traffic leaks 



commit 474a2ddaa192777522a7499784f1d60691cd831a upstream.

PCR_MATRIX field was set to all 1's when VLAN filtering is enabled, but
was not reset when it is disabled, which may cause traffic leaks:

	ip link add br0 type bridge vlan_filtering 1
	ip link add br1 type bridge vlan_filtering 1
	ip link set swp0 master br0
	ip link set swp1 master br1
	ip link set br0 type bridge vlan_filtering 0
	ip link set br1 type bridge vlan_filtering 0
	# traffic in br0 and br1 will start leaking to each other

As port_bridge_{add,del} have set up PCR_MATRIX properly, remove the
PCR_MATRIX write from mt7530_port_set_vlan_aware.

Fixes: 83163f7d ("net: dsa: mediatek: add VLAN support for MT7530")
Signed-off-by: default avatarDENG Qingfang <dqfext@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b176189

drivers/net/dsa/mt7530.c

+0 −8
Original line number Diff line number Diff line
@@ -851,14 +851,6 @@ mt7530_port_set_vlan_aware(struct dsa_switch *ds, int port) 
{

	struct mt7530_priv *priv = ds->priv;



	/* The real fabric path would be decided on the membership in the

	 * entry of VLAN table. PCR_MATRIX set up here with ALL_MEMBERS

	 * means potential VLAN can be consisting of certain subset of all

	 * ports.

	 */

	mt7530_rmw(priv, MT7530_PCR_P(port),

		   PCR_MATRIX_MASK, PCR_MATRIX(MT7530_ALL_MEMBERS));



	/* Trapped into security mode allows packet forwarding through VLAN

	 * table lookup. CPU port is set to fallback mode to let untagged

	 * frames pass through.