Merge nuts.ninka.net:/home/davem/src/BK/network-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
a38b483a · David S. Miller · e847679b · a907233d · a38b483a
Commit a38b483a authored Apr 27, 2003 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

net/ipv4/xfrm4_tunnel.c net/ipv4/xfrm4_tunnel.c +2 -0

No files found.
--- a/net/ipv4/xfrm4_tunnel.c
+++ b/net/ipv4/xfrm4_tunnel.c
@@ -174,6 +174,8 @@ static void ipip_err(struct sk_buff *skb, u32 info)

 static int ipip_init_state(struct xfrm_state *x, void *args)
 {
+	if (!x->props.mode)
+		return -EINVAL;
 	x->props.header_len = sizeof(struct iphdr);

 	return 0;