From: Li Hongjun <hongjun.li@6wind.com>
Date: Wed, 28 Aug 2013 09:54:50 +0000 (+0200)
Subject: ipv4 tunnels: fix an oops when using ipip/sit with IPsec
X-Git-Tag: v3.11~4^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=737e828bdbdaf2f9d7de07f20a0308ac46ce5178;p=pandora-kernel.git

ipv4 tunnels: fix an oops when using ipip/sit with IPsec

Since commit 3d7b46cd20e3 (ip_tunnel: push generic protocol handling to
ip_tunnel module.), an Oops is triggered when an xfrm policy is configured on
an IPv4 over IPv4 tunnel.

xfrm4_policy_check() calls __xfrm_policy_check2(), which uses skb_dst(skb). But
this field is NULL because iptunnel_pull_header() calls skb_dst_drop(skb).

Signed-off-by: Li Hongjun <hongjun.li@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed