net: dsa: mt7530: fix VLAN traffic leaks again
Subsystems (5)
PATCH 1/1 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.
--- drivers/net/dsa/mt7530.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/dsa/mt7530.c +1 -4
@@ -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)
Signature · 1 line
2.25.1
Quoted 10 lines · DENG Qingfang
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 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")Signed-off-by DENG Qingfang <[email protected]>---
That hunk looked indeed very strange when I went over it with commit 'net: dsa: remove the "dsa_to_port in a loop" antipattern from drivers', so I'm happy to see it go away.
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 11 lines · On Wed, 11 Aug 2021 17:50:43 +0800 you wrote:
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 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")Signed-off-by DENG Qingfang <[email protected]>[...]
Here is the summary with links:
- [net-next] net: dsa: mt7530: fix VLAN traffic leaks again
https://git.kernel.org/netdev/net-next/c/7428022b50d0
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html