linux-kernel - Re: [PATCH 3.4 077/176] net: Fix stacked vlan offload features computation

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]

Message-ID: <55272A08.6040105@huawei.com>
Date:	Fri, 10 Apr 2015 09:40:24 +0800
From:	Zefan Li <lizefan@...wei.com>
To:	Toshiaki Makita <makita.toshiaki@....ntt.co.jp>
CC:	<lizf@...nel.org>, <stable@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: [PATCH 3.4 077/176] net: Fix stacked vlan offload features computation

>> diff --git a/net/core/dev.c b/net/core/dev.c
>> index 0770364..f783dd3 100644
>> --- a/net/core/dev.c
>> +++ b/net/core/dev.c
>> @@ -2149,6 +2149,14 @@ netdev_features_t netif_skb_features(struct sk_buff *skb)
>>  	} else if (!vlan_tx_tag_present(skb)) {
>>  		return harmonize_features(skb, protocol, features);
>>  	}
>> +	if (!vlan_tx_tag_present(skb)) {
>> +		if (unlikely(protocol == htons(ETH_P_8021Q))) {
>> +			struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
>> +			protocol = veh->h_vlan_encapsulated_proto;
>> +		} else {
>> +			return harmonize_features(skb, protocol, features);
>> +		}
>> +        }
> 
> This does not look like a correct fix.
> We need to replace the existing check rather than add a new check, like
> this:
> https://lkml.org/lkml/2015/2/16/649

Will fix. Thanks for the review!

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/