* [PATCH net] net: dsa: mt7530: fix VLAN traffic leaks
@ 2021-05-23 14:48 DENG Qingfang
2021-05-23 14:51 ` [PATCH net v2] " DENG Qingfang
0 siblings, 1 reply; 4+ messages in thread
From: DENG Qingfang @ 2021-05-23 14:48 UTC (permalink / raw)
To: Sean Wang, Landen Chao, Andrew Lunn, Vivien Didelot,
Florian Fainelli, Vladimir Oltean, David S. Miller,
Jakub Kicinski, Matthias Brugger, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel
Cc: Frank Wunderlich
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 add set type bridge vlan_filtering 0
ip link add set 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>
---
drivers/net/dsa/mt7530.c | 8 --------
1 file changed, 8 deletions(-)
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.
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net v2] net: dsa: mt7530: fix VLAN traffic leaks
2021-05-23 14:48 [PATCH net] net: dsa: mt7530: fix VLAN traffic leaks DENG Qingfang
@ 2021-05-23 14:51 ` DENG Qingfang
2021-05-23 15:55 ` Florian Fainelli
2021-05-24 0:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 4+ messages in thread
From: DENG Qingfang @ 2021-05-23 14:51 UTC (permalink / raw)
To: Sean Wang, Landen Chao, Andrew Lunn, Vivien Didelot,
Florian Fainelli, Vladimir Oltean, David S. Miller,
Jakub Kicinski, Matthias Brugger, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel
Cc: Frank Wunderlich
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(-)
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.
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net v2] net: dsa: mt7530: fix VLAN traffic leaks
2021-05-23 14:51 ` [PATCH net v2] " DENG Qingfang
@ 2021-05-23 15:55 ` Florian Fainelli
2021-05-24 0:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2021-05-23 15:55 UTC (permalink / raw)
To: DENG Qingfang, Sean Wang, Landen Chao, Andrew Lunn,
Vivien Didelot, Vladimir Oltean, David S. Miller, Jakub Kicinski,
Matthias Brugger, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel
Cc: Frank Wunderlich
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>
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net v2] net: dsa: mt7530: fix VLAN traffic leaks
2021-05-23 14:51 ` [PATCH net v2] " DENG Qingfang
2021-05-23 15:55 ` Florian Fainelli
@ 2021-05-24 0:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-24 0:30 UTC (permalink / raw)
To: DENG Qingfang
Cc: sean.wang, Landen.Chao, andrew, vivien.didelot, f.fainelli,
olteanv, davem, kuba, matthias.bgg, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel, frank-w
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-25 0:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-23 14:48 [PATCH net] net: dsa: mt7530: fix VLAN traffic leaks DENG Qingfang
2021-05-23 14:51 ` [PATCH net v2] " DENG Qingfang
2021-05-23 15:55 ` Florian Fainelli
2021-05-24 0:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).