summaryrefslogtreecommitdiffstats
path: root/net/ipv4/icmp.c
diff options
context:
space:
mode:
authorHerbert Xu2007-12-13 03:47:48 +0100
committerDavid S. Miller2008-01-28 23:57:41 +0100
commit7233b9f33e72ca477034ff5cf901c89efba3a5bc (patch)
tree91f3ca124a86cd0be9ac068a98e895923e4c03f8 /net/ipv4/icmp.c
parent[BNX2]: Fix compiler warning. (diff)
downloadkernel-qcow2-linux-7233b9f33e72ca477034ff5cf901c89efba3a5bc.tar.gz
kernel-qcow2-linux-7233b9f33e72ca477034ff5cf901c89efba3a5bc.tar.xz
kernel-qcow2-linux-7233b9f33e72ca477034ff5cf901c89efba3a5bc.zip
[IPSEC]: Fix reversed ICMP6 policy check
The policy check I added for ICMP on IPv6 is reversed. This patch fixes that. It also adds an skb->sp check so that unprotected packets that fail the policy check do not crash the machine. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r--net/ipv4/icmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 3c41a6f7e6ec..c41f3cc4fba8 100644
--- a/net/ipv4/icmp.c
+++ b/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;