Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 737e828b authored by Li Hongjun's avatar Li Hongjun Committed by David S. Miller
Browse files

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



Since commit 3d7b46cd (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: default avatarLi Hongjun <hongjun.li@6wind.com>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c8d8518

net/ipv4/ipip.c

+2 −3
Original line number Diff line number Diff line
@@ -190,15 +190,14 @@ static int ipip_rcv(struct sk_buff *skb) 
	struct ip_tunnel *tunnel;

	const struct iphdr *iph;



	if (iptunnel_pull_header(skb, 0, tpi.proto))

		goto drop;



	iph = ip_hdr(skb);

	tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, TUNNEL_NO_KEY,

			iph->saddr, iph->daddr, 0);

	if (tunnel) {

		if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))

			goto drop;

		if (iptunnel_pull_header(skb, 0, tpi.proto))

			goto drop;

		return ip_tunnel_rcv(tunnel, skb, &tpi, log_ecn_error);

	}

net/ipv6/sit.c

+2 −4
Original line number Diff line number Diff line
@@ -645,11 +645,7 @@ static int ipip_rcv(struct sk_buff *skb) 
	const struct iphdr *iph;

	struct ip_tunnel *tunnel;



	if (iptunnel_pull_header(skb, 0, tpi.proto))

		goto drop;



	iph = ip_hdr(skb);



	tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev,

				     iph->saddr, iph->daddr);

	if (tunnel != NULL) {
@@ -659,6 +655,8 @@ static int ipip_rcv(struct sk_buff *skb) 


		if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))

			goto drop;

		if (iptunnel_pull_header(skb, 0, tpi.proto))

			goto drop;

		return ip_tunnel_rcv(tunnel, skb, &tpi, log_ecn_error);

	}