netdev - Re: [PATCH 1/1] netfilter: gre: Use the consitent GRE and PPTP struct instead of the structures defined in netfilter

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20160822092209.GA2810@salvia>
Date:   Mon, 22 Aug 2016 11:22:09 +0200
From:   Pablo Neira Ayuso <pablo@...filter.org>
To:     fgao@...ai8.com
Cc:     kaber@...sh.net, netfilter-devel@...r.kernel.org,
        philipp@...fish-solutions.com, netdev@...r.kernel.org,
        gfree.wind@...il.com
Subject: Re: [PATCH 1/1] netfilter: gre: Use the consitent GRE and PPTP
 struct instead of the structures defined in netfilter

On Fri, Aug 19, 2016 at 11:01:34PM +0800, fgao@...ai8.com wrote:
> From: Gao Feng <fgao@...ai8.com>
> 
> There are two structures which define the GRE header and PPTP
> header. So it is unneccessary to define duplicated structures in
> netfilter again.

Please, split this change in smaller patches, I'd suggest one to
replace GRE_* definitions and another to use generic GRE struct
definitions, so this makes it is easier to review.

> @@ -212,8 +212,8 @@ static bool gre_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
>  	if (!pgrehdr)
>  		return true;
>  
> -	if (ntohs(grehdr->protocol) != GRE_PROTOCOL_PPTP) {
> -		pr_debug("GRE_VERSION_PPTP but unknown proto\n");
> +	if (grehdr->protocol != GRE_PROTO_PPP) {
> +		pr_debug("Unknown GRE proto(0x%x)\n", ntohs(grehdr->protocol));

Something is fishy here, grehdr->protocol used to have ntohs(), the
pr_debug() still has it while the branch check does not.