提交 aebcf82c 编写于 作者: H Herbert Xu 提交者: David S. Miller

[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: NHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 bb72845e
......@@ -977,10 +977,13 @@ 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) && skb->sp &&
skb->sp->xvec[skb->sp->len - 1]->props.flags & XFRM_STATE_ICMP) {
if (!xfrm4_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;
if (!pskb_may_pull(skb, sizeof(*icmph) + sizeof(struct iphdr)))
goto drop;
......
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册