Skip to content

Commit

Permalink
[IPSEC]: Fix reversed ICMP6 policy check
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Herbert Xu authored and David S. Miller committed Jan 28, 2008
1 parent 2ba582b commit 7233b9f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion net/ipv4/icmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/icmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 7233b9f

Please sign in to comment.