[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <YTXEyPf3Pkh5TyuE@shredder>
Date: Mon, 6 Sep 2021 10:35:36 +0300
From: Ido Schimmel <idosch@...sch.org>
To: Willem de Bruijn <willemdebruijn.kernel@...il.com>
Cc: netdev@...r.kernel.org, davem@...emloft.net, kuba@...nel.org,
chouhan.shreyansh630@...il.com,
Willem de Bruijn <willemb@...gle.com>,
Alexander Duyck <alexander.duyck@...il.com>
Subject: Re: [PATCH net] ip_gre: validate csum_start only on pull
On Sun, Sep 05, 2021 at 11:21:09AM -0400, Willem de Bruijn wrote:
> From: Willem de Bruijn <willemb@...gle.com>
>
> The GRE tunnel device can pull existing outer headers in ipge_xmit.
> This is a rare path, apparently unique to this device. The below
> commit ensured that pulling does not move skb->data beyond csum_start.
>
> But it has a false positive if ip_summed is not CHECKSUM_PARTIAL and
> thus csum_start is irrelevant.
>
> Refine to exclude this. At the same time simplify and strengthen the
> test.
>
> Simplify, by moving the check next to the offending pull, making it
> more self documenting and removing an unnecessary branch from other
> code paths.
>
> Strengthen, by also ensuring that the transport header is correct and
> therefore the inner headers will be after skb_reset_inner_headers.
> The transport header is set to csum_start in skb_partial_csum_set.
>
> Link: https://lore.kernel.org/netdev/YS+h%2FtqCJJiQei+W@shredder/
> Fixes: 1d011c4803c7 ("ip_gre: add validation for csum_start")
> Reported-by: Ido Schimmel <idosch@...sch.org>
> Suggested-by: Alexander Duyck <alexander.duyck@...il.com>
> Signed-off-by: Willem de Bruijn <willemb@...gle.com>
FTR:
Tested-by: Ido Schimmel <idosch@...dia.com>
Thanks
Powered by blists - more mailing lists