From 869952c97aa25432cd499fdf531fa400e8758866 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 12 Dec 2007 18:47:48 -0800 Subject: [PATCH] --- yaml --- r: 78432 b: refs/heads/master c: 7233b9f33e72ca477034ff5cf901c89efba3a5bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/icmp.c | 2 +- trunk/net/ipv6/icmp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6bb3f6d0fcf1..553e3c01c4ce 100644 --- 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 index 3c41a6f7e6ec..c41f3cc4fba8 100644 --- 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 index c0bea7bfaa8a..1659d2fb01fe 100644 --- 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;