From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 4 Apr 2006 19:51:05 +0000 (-0700)
Subject: [IPSEC]: Check x->encap before dereferencing it
X-Git-Tag: v2.6.17-rc2~291^2~34
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8bf4b8a1083694d5aac292f92705ddd3aec29be6;p=linux-2.6-omap-h63xx.git

[IPSEC]: Check x->encap before dereferencing it

We need to dereference x->encap before dereferencing it for encap_type.
If it's absent then the encap_type is zero.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index e1b8f4b90d8..7a0b9524fe0 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -90,7 +90,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
 		if (unlikely(x->km.state != XFRM_STATE_VALID))
 			goto drop_unlock;
 
-		if (x->encap->encap_type != encap_type)
+		if ((x->encap ? x->encap->encap_type : 0) != encap_type)
 			goto drop_unlock;
 
 		if (x->props.replay_window && xfrm_replay_check(x, seq))