The patch titled ipsec: fix reversed ICMP6 policy check has been removed from the -mm tree. Its filename was ipsec-fix-reversed-icmp6-policy-check.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: ipsec: fix reversed ICMP6 policy check From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- net/ipv4/icmp.c | 2 +- net/ipv6/icmp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN net/ipv4/icmp.c~ipsec-fix-reversed-icmp6-policy-check net/ipv4/icmp.c --- a/net/ipv4/icmp.c~ipsec-fix-reversed-icmp6-policy-check +++ a/net/ipv4/icmp.c @@ -978,7 +978,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; diff -puN net/ipv6/icmp.c~ipsec-fix-reversed-icmp6-policy-check net/ipv6/icmp.c --- a/net/ipv6/icmp.c~ipsec-fix-reversed-icmp6-policy-check +++ a/net/ipv6/icmp.c @@ -646,7 +646,7 @@ static int icmpv6_rcv(struct sk_buff *sk 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; _ Patches currently in -mm which might be from herbert@xxxxxxxxxxxxxxxxxxx are origin.patch git-net.patch git-cryptodev.patch git-cryptodev-fixup.patch avoid-divide-in-is_align.patch remove-rcu_assign_pointer-penalty-for-null-pointers.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html