| Message ID | 20210811095043.1700061-1-dqfext@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 7428022b50d0fbb4846dd0f00639ea09d36dff02 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dsa: mt7530: fix VLAN traffic leaks again | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 13 of 13 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 12 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Wed, Aug 11, 2021 at 05:50:43PM +0800, DENG Qingfang 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 <dqfext@gmail.com> > --- 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. Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): 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 <dqfext@gmail.com> > > [...] 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
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 53e6150e95b6..77e0205e4e59 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -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)
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> --- drivers/net/dsa/mt7530.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)