netdev - Re: [PATCH net-next] net: dsa: tag_8021q: Fix dsa_8021q_restore

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 16 Nov 2019 17:24:24 +0100
From:   Andrew Lunn <andrew@...n.ch>
To:     Vladimir Oltean <olteanv@...il.com>
Cc:     f.fainelli@...il.com, vivien.didelot@...il.com,
        davem@...emloft.net, netdev@...r.kernel.org
Subject: Re: [PATCH net-next] net: dsa: tag_8021q: Fix dsa_8021q_restore_pvid
 for an absent pvid

On Sat, Nov 16, 2019 at 06:08:42PM +0200, Vladimir Oltean wrote:
> This sequence of operations:
> ip link set dev br0 type bridge vlan_filtering 1
> bridge vlan del dev swp2 vid 1
> ip link set dev br0 type bridge vlan_filtering 1
> ip link set dev br0 type bridge vlan_filtering 0

> --- a/net/dsa/tag_8021q.c
> +++ b/net/dsa/tag_8021q.c
> @@ -105,7 +105,7 @@ static int dsa_8021q_restore_pvid(struct dsa_switch *ds, int port)
>  	slave = dsa_to_port(ds, port)->slave;
>  
>  	err = br_vlan_get_pvid(slave, &pvid);
> -	if (err < 0)
> +	if (!pvid || err < 0)
>  		/* There is no pvid on the bridge for this port, which is
>  		 * perfectly valid. Nothing to restore, bye-bye!
>  		 */

This looks very similar to the previous patch. Some explanation would
be good. Did you send it for the wrong tree? Or are there really
different fixes for different trees?

Thanks
	Andrew