netdev - Re: [PATCH next-next 2/7] gre: Move utility functions to common headers

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: <20160503132944.1951cefb@griffin>
Date:	Tue, 3 May 2016 13:29:44 +0200
From:	Jiri Benc <jbenc@...hat.com>
To:	Tom Herbert <tom@...bertland.com>
Cc:	<davem@...emloft.net>, <netdev@...r.kernel.org>,
	<kernel-team@...com>
Subject: Re: [PATCH next-next 2/7] gre: Move utility functions to common
 headers

On Fri, 29 Apr 2016 17:12:16 -0700, Tom Herbert wrote:
>   - iptunnel_pull_header is taken out of gre_parse_header. This is now
>     done by caller. The header length is returned from gre_parse_header
>     in an int* argument.

Seems we conflicted here, I've done the same for net.git to fix ICMP
path. I made parse_gre_header return the length instead of adding the
parameter, as it's easier consumed that way (no need for an extra local
variable in gre_err).

How do we resolve the conflict between net and net-next? I'd prefer
gre_parse_header to return the header length. I can submit a patch for
net-next that does this; that would substantially ease the merge.

 Jiri