linux-kernel - Re: [PATCH v2,net-next 1/2] ip_gre: fix parsing gre header in ipgre

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: <4bd44714-8190-feca-27dc-6f6b254341f8@solarflare.com>
Date:   Fri, 14 Sep 2018 13:44:05 +0100
From:   Edward Cree <ecree@...arflare.com>
To:     David Miller <davem@...emloft.net>,
        <yanhaishuang@...s.chinamobile.com>
CC:     <kuznet@....inr.ac.ru>, <jbenc@...hat.com>,
        <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2,net-next 1/2] ip_gre: fix parsing gre header in
 ipgre_err

On 13/09/18 18:58, David Miller wrote:
> From: Haishuang Yan <yanhaishuang@...s.chinamobile.com>
> Date: Wed, 12 Sep 2018 17:21:21 +0800
>
>> @@ -86,7 +86,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
>>  
>>  	options = (__be32 *)(greh + 1);
>>  	if (greh->flags & GRE_CSUM) {
>> -		if (skb_checksum_simple_validate(skb)) {
>> +		if (csum_err && skb_checksum_simple_validate(skb)) {
>>  			*csum_err = true;
>>  			return -EINVAL;
>>  		}
> You want to ignore csum errors, but you do not want to elide the side
> effects of the skb_checksum_simple_validate() call which are to set
> skb->csum_valid and skb->csum.
>
> Therefore, the skb_checksum_simple_validate() call still needs to be
> performed. We just wont return -EINVAL in the NULL csum_err case.

How about just reversing the order of the AND?

	if (skb_checksum_simple_validate(skb) && csum_err) {
		*csum_err = true;
		return -EINVAL;
	}