Commit 7233b9f3 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ba582b7
...@@ -977,7 +977,7 @@ int icmp_rcv(struct sk_buff *skb) ...@@ -977,7 +977,7 @@ int icmp_rcv(struct sk_buff *skb)
struct icmphdr *icmph; struct icmphdr *icmph;
struct rtable *rt = (struct rtable *)skb->dst; 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) { skb->sp->xvec[skb->sp->len - 1]->props.flags & XFRM_STATE_ICMP) {
int nh; int nh;
......
...@@ -644,7 +644,7 @@ static int icmpv6_rcv(struct sk_buff *skb) ...@@ -644,7 +644,7 @@ static int icmpv6_rcv(struct sk_buff *skb)
struct icmp6hdr *hdr; struct icmp6hdr *hdr;
int type; 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) { skb->sp->xvec[skb->sp->len - 1]->props.flags & XFRM_STATE_ICMP) {
int nh; int nh;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment