netdev - Re: [PATCH net-next] ip_gre: increase inner ip header ID only for IPv4

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, 23 Mar 2013 19:10:46 +0400
From:	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To:	Cong Wang <amwang@...hat.com>
CC:	netdev@...r.kernel.org, Pravin B Shelar <pshelar@...ira.com>,
	Eric Dumazet <edumazet@...gle.com>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: [PATCH net-next] ip_gre: increase inner ip header ID only for
 IPv4

Hello.

On 23-03-2013 9:29, Cong Wang wrote:

> From: Cong Wang <amwang@...hat.com>

> Pravin pointed out the inner network header of a GRE tunnel packet
> could be IPv6, where there is no ID. So we should check the version.

> Cc: Pravin B Shelar <pshelar@...ira.com>
> Cc: Eric Dumazet <edumazet@...gle.com>
> Cc: "David S. Miller" <davem@...emloft.net>
> Signed-off-by: Cong Wang <amwang@...hat.com>

> ---
> diff --git a/net/ipv4/gre.c b/net/ipv4/gre.c
> index e20631c..a2516f5 100644
> --- a/net/ipv4/gre.c
> +++ b/net/ipv4/gre.c
[...]
> @@ -172,7 +172,12 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
>   	skb->mac_len = skb_inner_network_offset(skb);
>
>   	iph = ip_hdr(skb);
> -	id = ntohs(iph->id);
> +	if (iph->version == 4) {
> +		ipv4 = true;
> +		id = ntohs(iph->id);
> +	} else
> +		ipv4 = false;

    Both arms of *if* statement should have {}, according to 
Documentation/CodingStyle chapter 3.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html