aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_mode_tunnel.c
diff options
context:
space:
mode:
authorKazunori MIYAZAWA <kazunori@miyazawa.org>2007-05-29 13:03:17 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-05-31 01:23:28 -0700
commitf282d45cb496e3960046afd3d5f241265eda6fde (patch)
tree2566fb04f61894871a926f946421eae330f20831 /net/ipv4/xfrm4_mode_tunnel.c
parent[NET]: parse ip:port strings correctly in in4_pton (diff)
downloadlinux-dev-f282d45cb496e3960046afd3d5f241265eda6fde.tar.xz
linux-dev-f282d45cb496e3960046afd3d5f241265eda6fde.zip
[IPSEC]: Fix panic when using inter address familiy IPsec on loopback.
Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
-rw-r--r--net/ipv4/xfrm4_mode_tunnel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index a2f2e6a5ec5d..9963700e74c1 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -85,6 +85,8 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
top_iph->saddr = x->props.saddr.a4;
top_iph->daddr = x->id.daddr.a4;
+ skb->protocol = htons(ETH_P_IP);
+
memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
return 0;
}