---

yaml --- r: 78432 b: refs/heads/master c: 7233b9f h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · 869952c · 869952c
1 parent 01629d2
commit 869952c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ba582b782071c038b312ea330d3090a39f3c66a
+refs/heads/master: 7233b9f33e72ca477034ff5cf901c89efba3a5bc
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
@@ -977,7 +977,7 @@ int icmp_rcv(struct sk_buff *skb)
 	struct icmphdr *icmph;
 	struct rtable *rt = (struct rtable *)skb->dst;
 
-	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb) &&
+	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb) && skb->sp &&
 	    skb->sp->xvec[skb->sp->len - 1]->props.flags & XFRM_STATE_ICMP) {
 		int nh;
 

diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
@@ -644,7 +644,7 @@ static int icmpv6_rcv(struct sk_buff *skb)
 	struct icmp6hdr *hdr;
 	int type;
 
-	if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb) &&
+	if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb) && skb->sp &&
 	    skb->sp->xvec[skb->sp->len - 1]->props.flags & XFRM_STATE_ICMP) {
 		int nh;