]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ip6_gre: fix ip6gre_err() invalid reads
authorEric Dumazet <edumazet@google.com>
Sun, 5 Feb 2017 07:18:55 +0000 (23:18 -0800)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:46:58 +0000 (00:46 +0200)
commita05c8e396426c36837798bb253140774b047600a
tree2ea121ed57bd1f2bef5aa9e61f23e212efbc2cdf
parent96296cddf9d174bd1a925e2ffa4463f2eb3259c5
ip6_gre: fix ip6gre_err() invalid reads

commit 7892032cfe67f4bde6fc2ee967e45a8fbaf33756 upstream.

Andrey Konovalov reported out of bound accesses in ip6gre_err()

If GRE flags contains GRE_KEY, the following expression
*(((__be32 *)p) + (grehlen / 4) - 1)

accesses data ~40 bytes after the expected point, since
grehlen includes the size of IPv6 headers.

Let's use a "struct gre_base_hdr *greh" pointer to make this
code more readable.

p[1] becomes greh->protocol.
grhlen is the GRE header length.

Fixes: c12b395a4664 ("gre: Support GRE over IPv6")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
net/ipv6/ip6_gre.c