| Message ID | 20210823070928.166082-1-dqfext@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [5.4.y] net: dsa: mt7530: fix VLAN traffic leaks again | expand |
On Mon, Aug 23, 2021 at 03:09:27PM +0800, DENG Qingfang wrote: > [ Upstream commit 7428022b50d0fbb4846dd0f00639ea09d36dff02 ] > > 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: 4fe4e1f48ba1 ("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> > --- > drivers/net/dsa/mt7530.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) Now queued up, thanks. greg k-h
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index aec606058d98..fc45af12612f 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -840,11 +840,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)
[ Upstream commit 7428022b50d0fbb4846dd0f00639ea09d36dff02 ] 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: 4fe4e1f48ba1 ("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> --- drivers/net/dsa/mt7530.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)