aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-12-12 18:54:16 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:57:43 -0800
commitaebcf82c1fe9231be5cb4f9c1362d5db39e7d7b2 (patch)
treef164bead26b172ee82d6eaa81a0148d980985bce /net/ipv6
parentbb72845e699d3c84e5f861b51db686107a51dea5 (diff)
[IPSEC]: Do not let packets pass when ICMP flag is off
This fixes a logical error in ICMP policy checks which lets packets through if the state ICMP flag is off. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/icmp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 1659d2fb01f..c3bbd868730 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -644,10 +644,13 @@ static int icmpv6_rcv(struct sk_buff *skb)
struct icmp6hdr *hdr;
int type;
- if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb) && skb->sp &&
- skb->sp->xvec[skb->sp->len - 1]->props.flags & XFRM_STATE_ICMP) {
+ if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
int nh;
+ if (!(skb->sp && skb->sp->xvec[skb->sp->len - 1]->props.flags &
+ XFRM_STATE_ICMP))
+ goto drop_no_count;
+
if (!pskb_may_pull(skb, sizeof(*hdr) + sizeof(*orig_hdr)))
goto drop_no_count;