net: ip6_gre: get ipv6hdr after skb_cow_head()
authorPrashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Fri, 13 Jul 2018 05:40:50 +0000 (14:40 +0900)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Jul 2018 20:39:47 +0000 (13:39 -0700)
commitb7ed879425be371905d856410d19e9a42a62bcf3
treebfc68d99f78c5897875eced15f2328252a9c23dd
parent6e8cfd6d9d8049e2fd5b2de8a328519dc58ea1e6
net: ip6_gre: get ipv6hdr after skb_cow_head()

A KASAN:use-after-free bug was found related to ip6-erspan
while running selftests/net/ip6_gre_headroom.sh

It happens because of following sequence:
- ipv6hdr pointer is obtained from skb
- skb_cow_head() is called, skb->head memory is reallocated
- old data is accessed using ipv6hdr pointer

skb_cow_head() call was added in e41c7c68ea77 ("ip6erspan: make sure
enough headroom at xmit."), but looking at the history there was a
chance of similar bug because gre_handle_offloads() and pskb_trim()
can also reallocate skb->head memory. Fixes tag points to commit
which introduced possibility of this bug.

This patch moves ipv6hdr pointer assignment after skb_cow_head() call.

Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support")
Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_gre.c