3 files changed, 90 insertions, 99 deletions

diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index b693f841aeb4..1cf3f0c6a959 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -598,7 +598,7 @@ static int __init ip6_queue_init(void)
 #ifdef CONFIG_SYSCTL
         ipq_sysctl_header = register_sysctl_paths(net_ipv6_ctl_path, ipq_table);
 #endif
-        status = nf_register_queue_handler(PF_INET6, &nfqh);
+        status = nf_register_queue_handler(NFPROTO_IPV6, &nfqh);
         if (status < 0) {
                 printk(KERN_ERR "ip6_queue: failed to register queue handler\n");
                 goto cleanup_sysctl;
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 219e165aea10..ced1f2c0cb65 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -270,8 +270,8 @@ static struct nf_loginfo trace_loginfo = {
 /* Mildly perf critical (only if packet tracing is on) */
 static inline int
 get_chainname_rulenum(struct ip6t_entry *s, struct ip6t_entry *e,
-                      char *hookname, char **chainname,
-                      char **comment, unsigned int *rulenum)
+                      const char *hookname, const char **chainname,
+                      const char **comment, unsigned int *rulenum)
 {
         struct ip6t_standard_target *t = (void *)ip6t_get_target(s);
 
@@ -289,8 +289,8 @@ get_chainname_rulenum(struct ip6t_entry *s, struct ip6t_entry *e,
                    && unconditional(&s->ipv6)) {
                         /* Tail of chains: STANDARD target (return/policy) */
                         *comment = *chainname == hookname
-                                ? (char *)comments[NF_IP6_TRACE_COMMENT_POLICY]
-                                : (char *)comments[NF_IP6_TRACE_COMMENT_RETURN];
+                                ? comments[NF_IP6_TRACE_COMMENT_POLICY]
+                                : comments[NF_IP6_TRACE_COMMENT_RETURN];
                 }
                 return 1;
         } else
@@ -309,14 +309,14 @@ static void trace_packet(struct sk_buff *skb,
 {
         void *table_base;
         const struct ip6t_entry *root;
-        char *hookname, *chainname, *comment;
+        const char *hookname, *chainname, *comment;
         unsigned int rulenum = 0;
 
-        table_base = (void *)private->entries[smp_processor_id()];
+        table_base = private->entries[smp_processor_id()];
         root = get_entry(table_base, private->hook_entry[hook]);
 
-        hookname = chainname = (char *)hooknames[hook];
-        comment = (char *)comments[NF_IP6_TRACE_COMMENT_RULE];
+        hookname = chainname = hooknames[hook];
+        comment = comments[NF_IP6_TRACE_COMMENT_RULE];
 
         IP6T_ENTRY_ITERATE(root,
                            private->size - private->hook_entry[hook],
@@ -329,6 +329,12 @@ static void trace_packet(struct sk_buff *skb,
 }
 #endif
 
+static inline __pure struct ip6t_entry *
+ip6t_next_entry(const struct ip6t_entry *entry)
+{
+        return (void *)entry + entry->next_offset;
+}
+
 /* Returns one of the generic firewall policies, like NF_ACCEPT. */
 unsigned int
 ip6t_do_table(struct sk_buff *skb,
@@ -337,6 +343,8 @@ ip6t_do_table(struct sk_buff *skb,
               const struct net_device *out,
               struct xt_table *table)
 {
+#define tb_comefrom ((struct ip6t_entry *)table_base)->comefrom
+
         static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));
         bool hotdrop = false;
         /* Initializing verdict to NF_DROP keeps gcc happy. */
@@ -361,7 +369,7 @@ ip6t_do_table(struct sk_buff *skb,
         mtpar.in      = tgpar.in  = in;
         mtpar.out     = tgpar.out = out;
         mtpar.family  = tgpar.family = NFPROTO_IPV6;
-        tgpar.hooknum = hook;
+        mtpar.hooknum = tgpar.hooknum = hook;
 
         IP_NF_ASSERT(table->valid_hooks & (1 << hook));
 
@@ -375,96 +383,86 @@ ip6t_do_table(struct sk_buff *skb,
         back = get_entry(table_base, private->underflow[hook]);
 
         do {
+                struct ip6t_entry_target *t;
+
                 IP_NF_ASSERT(e);
                 IP_NF_ASSERT(back);
-                if (ip6_packet_match(skb, indev, outdev, &e->ipv6,
-                        &mtpar.thoff, &mtpar.fragoff, &hotdrop)) {
-                        struct ip6t_entry_target *t;
-
-                        if (IP6T_MATCH_ITERATE(e, do_match, skb, &mtpar) != 0)
-                                goto no_match;
+                if (!ip6_packet_match(skb, indev, outdev, &e->ipv6,
+                    &mtpar.thoff, &mtpar.fragoff, &hotdrop) ||
+                    IP6T_MATCH_ITERATE(e, do_match, skb, &mtpar) != 0) {
+                        e = ip6t_next_entry(e);
+                        continue;
+                }
 
-                        ADD_COUNTER(e->counters,
-                                    ntohs(ipv6_hdr(skb)->payload_len) +
-                                    sizeof(struct ipv6hdr), 1);
+                ADD_COUNTER(e->counters,
+                            ntohs(ipv6_hdr(skb)->payload_len) +
+                            sizeof(struct ipv6hdr), 1);
 
-                        t = ip6t_get_target(e);
-                        IP_NF_ASSERT(t->u.kernel.target);
+                t = ip6t_get_target(e);
+                IP_NF_ASSERT(t->u.kernel.target);
 
 #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
     defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)
-                        /* The packet is traced: log it */
-                        if (unlikely(skb->nf_trace))
-                                trace_packet(skb, hook, in, out,
-                                             table->name, private, e);
+                /* The packet is traced: log it */
+                if (unlikely(skb->nf_trace))
+                        trace_packet(skb, hook, in, out,
+                                     table->name, private, e);
 #endif
-                        /* Standard target? */
-                        if (!t->u.kernel.target->target) {
-                                int v;
-
-                                v = ((struct ip6t_standard_target *)t)->verdict;
-                                if (v < 0) {
-                                        /* Pop from stack? */
-                                        if (v != IP6T_RETURN) {
-                                                verdict = (unsigned)(-v) - 1;
-                                                break;
-                                        }
-                                        e = back;
-                                        back = get_entry(table_base,
-                                                         back->comefrom);
-                                        continue;
-                                }
-                                if (table_base + v != (void *)e + e->next_offset
-                                    && !(e->ipv6.flags & IP6T_F_GOTO)) {
-                                        /* Save old back ptr in next entry */
-                                        struct ip6t_entry *next
-                                                = (void *)e + e->next_offset;
-                                        next->comefrom
-                                                = (void *)back - table_base;
-                                        /* set back pointer to next entry */
-                                        back = next;
+                /* Standard target? */
+                if (!t->u.kernel.target->target) {
+                        int v;
+
+                        v = ((struct ip6t_standard_target *)t)->verdict;
+                        if (v < 0) {
+                                /* Pop from stack? */
+                                if (v != IP6T_RETURN) {
+                                        verdict = (unsigned)(-v) - 1;
+                                        break;
                                 }
+                                e = back;
+                                back = get_entry(table_base, back->comefrom);
+                                continue;
+                        }
+                        if (table_base + v != ip6t_next_entry(e)
+                            && !(e->ipv6.flags & IP6T_F_GOTO)) {
+                                /* Save old back ptr in next entry */
+                                struct ip6t_entry *next = ip6t_next_entry(e);
+                                next->comefrom = (void *)back - table_base;
+                                /* set back pointer to next entry */
+                                back = next;
+                        }
 
-                                e = get_entry(table_base, v);
-                        } else {
-                                /* Targets which reenter must return
-                                   abs. verdicts */
-                                tgpar.target   = t->u.kernel.target;
-                                tgpar.targinfo = t->data;
+                        e = get_entry(table_base, v);
+                        continue;
+                }
 
-#ifdef CONFIG_NETFILTER_DEBUG
-                                ((struct ip6t_entry *)table_base)->comefrom
-                                        = 0xeeeeeeec;
-#endif
-                                verdict = t->u.kernel.target->target(skb,
-                                                                     &tgpar);
+                /* Targets which reenter must return
+                   abs. verdicts */
+                tgpar.target   = t->u.kernel.target;
+                tgpar.targinfo = t->data;
 
 #ifdef CONFIG_NETFILTER_DEBUG
-                                if (((struct ip6t_entry *)table_base)->comefrom
-                                    != 0xeeeeeeec
-                                    && verdict == IP6T_CONTINUE) {
-                                        printk("Target %s reentered!\n",
-                                               t->u.kernel.target->name);
-                                        verdict = NF_DROP;
-                                }
-                                ((struct ip6t_entry *)table_base)->comefrom
-                                        = 0x57acc001;
+                tb_comefrom = 0xeeeeeeec;
 #endif
-                                if (verdict == IP6T_CONTINUE)
-                                        e = (void *)e + e->next_offset;
-                                else
-                                        /* Verdict */
-                                        break;
-                        }
-                } else {
+                verdict = t->u.kernel.target->target(skb, &tgpar);
 
-                no_match:
-                        e = (void *)e + e->next_offset;
+#ifdef CONFIG_NETFILTER_DEBUG
+                if (tb_comefrom != 0xeeeeeeec && verdict == IP6T_CONTINUE) {
+                        printk("Target %s reentered!\n",
+                               t->u.kernel.target->name);
+                        verdict = NF_DROP;
                 }
+                tb_comefrom = 0x57acc001;
+#endif
+                if (verdict == IP6T_CONTINUE)
+                        e = ip6t_next_entry(e);
+                else
+                        /* Verdict */
+                        break;
         } while (!hotdrop);
 
 #ifdef CONFIG_NETFILTER_DEBUG
-        ((struct ip6t_entry *)table_base)->comefrom = NETFILTER_LINK_POISON;
+        tb_comefrom = NETFILTER_LINK_POISON;
 #endif
         xt_info_rdunlock_bh();
 
@@ -475,6 +473,8 @@ ip6t_do_table(struct sk_buff *skb,
                 return NF_DROP;
         else return verdict;
 #endif
+
+#undef tb_comefrom
 }
 
 /* Figures out from what hook each rule can be called: returns 0 if
@@ -2191,7 +2191,7 @@ static bool icmp6_checkentry(const struct xt_mtchk_param *par)
 static struct xt_target ip6t_standard_target __read_mostly = {
         .name           = IP6T_STANDARD_TARGET,
         .targetsize     = sizeof(int),
-        .family         = AF_INET6,
+        .family         = NFPROTO_IPV6,
 #ifdef CONFIG_COMPAT
         .compatsize     = sizeof(compat_int_t),
         .compat_from_user = compat_standard_from_user,
@@ -2203,7 +2203,7 @@ static struct xt_target ip6t_error_target __read_mostly = {
         .name           = IP6T_ERROR_TARGET,
         .target         = ip6t_error,
         .targetsize     = IP6T_FUNCTION_MAXNAMELEN,
-        .family         = AF_INET6,
+        .family         = NFPROTO_IPV6,
 };
 
 static struct nf_sockopt_ops ip6t_sockopts = {
@@ -2229,17 +2229,17 @@ static struct xt_match icmp6_matchstruct __read_mostly = {
         .matchsize      = sizeof(struct ip6t_icmp),
         .checkentry     = icmp6_checkentry,
         .proto          = IPPROTO_ICMPV6,
-        .family         = AF_INET6,
+        .family         = NFPROTO_IPV6,
 };
 
 static int __net_init ip6_tables_net_init(struct net *net)
 {
-        return xt_proto_init(net, AF_INET6);
+        return xt_proto_init(net, NFPROTO_IPV6);
 }
 
 static void __net_exit ip6_tables_net_exit(struct net *net)
 {
-        xt_proto_fini(net, AF_INET6);
+        xt_proto_fini(net, NFPROTO_IPV6);
 }
 
 static struct pernet_operations ip6_tables_net_ops = {
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index 9903227bf37c..642dcb127bab 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -95,18 +95,10 @@ static int icmpv6_packet(struct nf_conn *ct,
                        u_int8_t pf,
                        unsigned int hooknum)
 {
-        /* Try to delete connection immediately after all replies:
-           won't actually vanish as we still have skb, and del_timer
-           means this will only run once even if count hits zero twice
-           (theoretically possible with SMP) */
-        if (CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY) {
-                if (atomic_dec_and_test(&ct->proto.icmp.count))
-                        nf_ct_kill_acct(ct, ctinfo, skb);
-        } else {
-                atomic_inc(&ct->proto.icmp.count);
-                nf_conntrack_event_cache(IPCT_PROTOINFO_VOLATILE, ct);
-                nf_ct_refresh_acct(ct, ctinfo, skb, nf_ct_icmpv6_timeout);
-        }
+        /* Do not immediately delete the connection after the first
+           successful reply to avoid excessive conntrackd traffic
+           and also to handle correctly ICMP echo reply duplicates. */
+        nf_ct_refresh_acct(ct, ctinfo, skb, nf_ct_icmpv6_timeout);
 
         return NF_ACCEPT;
 }
@@ -132,7 +124,6 @@ static bool icmpv6_new(struct nf_conn *ct, const struct sk_buff *skb,
                                       type + 128);
                 return false;
         }
-        atomic_set(&ct->proto.icmp.count, 0);
         return true;
 }