From bb64b8766ea00651b320f439bb57149860be5324 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Wed, 18 Feb 2009 16:30:56 +0100 Subject: [PATCH] --- yaml --- r: 135472 b: refs/heads/master c: 55df4ac0c927c7f1f84e6d75532f0ca45d391e64 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2bfc5b3ed342..4614fbcb9407 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 842bff366b536787b88c07cbf2416e2cb26cae67 +refs/heads/master: 55df4ac0c927c7f1f84e6d75532f0ca45d391e64 diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index c323643ffcf9..165b256a6fa0 100644 --- a/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +++ b/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c @@ -126,6 +126,10 @@ static bool icmpv6_new(struct nf_conn *ct, const struct sk_buff *skb, pr_debug("icmpv6: can't create new conn with type %u\n", type + 128); nf_ct_dump_tuple_ipv6(&ct->tuplehash[0].tuple); + if (LOG_INVALID(nf_ct_net(ct), IPPROTO_ICMPV6)) + nf_log_packet(PF_INET6, 0, skb, NULL, NULL, NULL, + "nf_ct_icmpv6: invalid new with type %d ", + type + 128); return false; } atomic_set(&ct->proto.icmp.count, 0);