LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, DENG Qingfang <dqfext@gmail.com>, Vladimir Oltean <olteanv@gmail.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 5.14 03/11] net: dsa: mt7530: fix VLAN traffic leaks again Date: Wed, 1 Sep 2021 14:29:11 +0200 [thread overview] Message-ID: <20210901122249.629865060@linuxfoundation.org> (raw) In-Reply-To: <20210901122249.520249736@linuxfoundation.org> From: DENG Qingfang <dqfext@gmail.com> 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> --- drivers/net/dsa/mt7530.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1308,11 +1308,8 @@ mt7530_port_bridge_leave(struct dsa_swit /* 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)
next prev parent reply other threads:[~2021-09-01 12:55 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-01 12:29 [PATCH 5.14 00/11] 5.14.1-rc1 review Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 01/11] vt_kdsetmode: extend console locking Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 02/11] Bluetooth: btusb: check conditions before enabling USB ALT 3 for WBS Greg Kroah-Hartman 2021-09-01 12:29 ` Greg Kroah-Hartman [this message] 2021-09-01 12:29 ` [PATCH 5.14 04/11] btrfs: fix NULL pointer dereference when deleting device by invalid id Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 05/11] Revert "floppy: reintroduce O_NDELAY fix" Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 06/11] fscrypt: add fscrypt_symlink_getattr() for computing st_size Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 07/11] ext4: report correct st_size for encrypted symlinks Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 08/11] f2fs: " Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 09/11] ubifs: " Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 10/11] net: dont unconditionally copy_from_user a struct ifreq for socket ioctls Greg Kroah-Hartman 2021-09-01 12:29 ` [PATCH 5.14 11/11] audit: move put_tree() to avoid trim_trees refcount underflow and UAF Greg Kroah-Hartman 2021-09-01 19:04 ` [PATCH 5.14 00/11] 5.14.1-rc1 review Fox Chen 2021-09-01 21:20 ` Shuah Khan 2021-09-02 8:44 ` Naresh Kamboju 2021-09-02 21:51 ` Guenter Roeck 2021-09-02 23:58 ` Florian Fainelli
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210901122249.629865060@linuxfoundation.org \ --to=gregkh@linuxfoundation.org \ --cc=davem@davemloft.net \ --cc=dqfext@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=olteanv@gmail.com \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).