diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-12 18:47:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:57:41 -0800 |
| commit | 7233b9f33e72ca477034ff5cf901c89efba3a5bc (patch) | |
| tree | 91f3ca124a86cd0be9ac068a98e895923e4c03f8 /net | |
| parent | 2ba582b782071c038b312ea330d3090a39f3c66a (diff) | |
| download | linux-7233b9f33e72ca477034ff5cf901c89efba3a5bc.tar.gz linux-7233b9f33e72ca477034ff5cf901c89efba3a5bc.tar.bz2 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')
| -rw-r--r-- | net/ipv4/icmp.c | 2 | ||||
| -rw-r--r-- | net/ipv6/icmp.c | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index c0bea7bfaa8a..1659d2fb01fe 100644 --- a/net/ipv6/icmp.c +++ b/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; |