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

[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

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv6/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE