diff options
| author | DENG Qingfang <dqfext@gmail.com> | 2021-08-11 17:50:43 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-03 10:23:06 +0200 |
| commit | 98d1fcc6c937b0fd8c4ad5a9e386dd934d0c63b6 (patch) | |
| tree | 6cb3feda692f64533ce2eb0be8badf87d1665d3d /drivers | |
| parent | 339e8ba1a3d06b50e71a202dd05523a08227bd65 (diff) | |
| download | linux-98d1fcc6c937b0fd8c4ad5a9e386dd934d0c63b6.tar.gz linux-98d1fcc6c937b0fd8c4ad5a9e386dd934d0c63b6.tar.bz2 linux-98d1fcc6c937b0fd8c4ad5a9e386dd934d0c63b6.zip | |
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: 83163f7dca56 ("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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 167c599a81a5..2b01efad1a51 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1295,11 +1295,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) |