]> git.baikalelectronics.ru Git - kernel.git/commit
ipv4 tunnels: fix an oops when using ipip/sit with IPsec
authorLi Hongjun <hongjun.li@6wind.com>
Wed, 28 Aug 2013 09:54:50 +0000 (11:54 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Aug 2013 21:13:28 +0000 (17:13 -0400)
commitf5689d9c0c86e7175cd975961688f6546dbb2c56
treeab12496674c4006b6a5cde6c53b7e18407bb1d44
parent4734ed2484927ea10f60a748abd97a5d4e9a6a46
ipv4 tunnels: fix an oops when using ipip/sit with IPsec

Since commit af1b379eaf20 (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>
net/ipv4/ipip.c
net/ipv6/sit.c