diff mbox series

[net,v2] net: dsa: mt7530: fix VLAN traffic leaks

Message ID 20210523145154.655325-1-dqfext@gmail.com (mailing list archive)
State New
Headers show
Series [net,v2] net: dsa: mt7530: fix VLAN traffic leaks | expand

Commit Message

DENG Qingfang May 23, 2021, 2:51 p.m. UTC
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: 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
Signed-off-by: DENG Qingfang <dqfext@gmail.com>
---
v1 -> v2: Fix typo in commit message

 drivers/net/dsa/mt7530.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Florian Fainelli May 23, 2021, 3:55 p.m. UTC | #1
On 5/23/2021 7:51 AM, DENG Qingfang wrote:
> 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: 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
> Signed-off-by: DENG Qingfang <dqfext@gmail.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
patchwork-bot+netdevbpf@kernel.org May 24, 2021, 12:30 a.m. UTC | #2
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Sun, 23 May 2021 22:51:54 +0800 you wrote:
> 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
> 
> [...]

Here is the summary with links:
  - [net,v2] net: dsa: mt7530: fix VLAN traffic leaks
    https://git.kernel.org/netdev/net/c/474a2ddaa192

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index db838343fb05..93136f7e69f5 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1273,14 +1273,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.