| Message ID | 20210523145154.655325-1-dqfext@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 474a2ddaa192777522a7499784f1d60691cd831a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] net: dsa: mt7530: fix VLAN traffic leaks | 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 |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 12 of 12 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, 14 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
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>
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 --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.
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(-)