Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 16 insertions, 18 deletions

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index db2312eeb2a4..f204274a9b6b 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1544,6 +1544,8 @@ void nf_conntrack_cleanup_end(void)
         nf_conntrack_tstamp_fini();
         nf_conntrack_acct_fini();
         nf_conntrack_expect_fini();
+
+        kmem_cache_destroy(nf_conntrack_cachep);
 }
 
 /*
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 7b7aa871a174..2c881871db38 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2946,24 +2946,20 @@ int nf_tables_bind_set(const struct nft_ctx *ctx, struct nft_set *set,
                  * jumps are already validated for that chain.
                  */
                 list_for_each_entry(i, &set->bindings, list) {
-                        if (binding->flags & NFT_SET_MAP &&
+                        if (i->flags & NFT_SET_MAP &&
                             i->chain == binding->chain)
                                 goto bind;
                 }
 
+                iter.genmask    = nft_genmask_next(ctx->net);
                 iter.skip       = 0;
                 iter.count      = 0;
                 iter.err        = 0;
                 iter.fn         = nf_tables_bind_check_setelem;
 
                 set->ops->walk(ctx, set, &iter);
-                if (iter.err < 0) {
-                        /* Destroy anonymous sets if binding fails */
-                        if (set->flags & NFT_SET_ANONYMOUS)
-                                nf_tables_set_destroy(ctx, set);
-
+                if (iter.err < 0)
                         return iter.err;
-                }
         }
 bind:
         binding->chain = ctx->chain;
@@ -3192,12 +3188,13 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb)
         if (nest == NULL)
                 goto nla_put_failure;
 
-        args.cb         = cb;
-        args.skb        = skb;
-        args.iter.skip  = cb->args[0];
-        args.iter.count = 0;
-        args.iter.err   = 0;
-        args.iter.fn    = nf_tables_dump_setelem;
+        args.cb                 = cb;
+        args.skb                = skb;
+        args.iter.genmask       = nft_genmask_cur(ctx.net);
+        args.iter.skip          = cb->args[0];
+        args.iter.count         = 0;
+        args.iter.err           = 0;
+        args.iter.fn            = nf_tables_dump_setelem;
         set->ops->walk(&ctx, set, &args.iter);
 
         nla_nest_end(skb, nest);
@@ -4284,6 +4281,7 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,
                             binding->chain != chain)
                                 continue;
 
+                        iter.genmask    = nft_genmask_next(ctx->net);
                         iter.skip       = 0;
                         iter.count      = 0;
                         iter.err        = 0;
diff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c
index e9f8dffcc244..fb8b5892b5ff 100644
--- a/net/netfilter/nf_tables_core.c
+++ b/net/netfilter/nf_tables_core.c
@@ -143,7 +143,7 @@ next_rule:
         list_for_each_entry_continue_rcu(rule, &chain->rules, list) {
 
                 /* This rule is not active, skip. */
-                if (unlikely(rule->genmask & (1 << gencursor)))
+                if (unlikely(rule->genmask & gencursor))
                         continue;
 
                 rulenum++;
diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index 6fa016564f90..f39c53a159eb 100644
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -189,7 +189,6 @@ static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set,
         struct nft_hash_elem *he;
         struct rhashtable_iter hti;
         struct nft_set_elem elem;
-        u8 genmask = nft_genmask_cur(read_pnet(&set->pnet));
         int err;
 
         err = rhashtable_walk_init(&priv->ht, &hti, GFP_KERNEL);
@@ -218,7 +217,7 @@ static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set,
                         goto cont;
                 if (nft_set_elem_expired(&he->ext))
                         goto cont;
-                if (!nft_set_elem_active(&he->ext, genmask))
+                if (!nft_set_elem_active(&he->ext, iter->genmask))
                         goto cont;
 
                 elem.priv = he;
diff --git a/net/netfilter/nft_rbtree.c b/net/netfilter/nft_rbtree.c
index f762094af7c1..7201d57b5a93 100644
--- a/net/netfilter/nft_rbtree.c
+++ b/net/netfilter/nft_rbtree.c
@@ -211,7 +211,6 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,
         struct nft_rbtree_elem *rbe;
         struct nft_set_elem elem;
         struct rb_node *node;
-        u8 genmask = nft_genmask_cur(read_pnet(&set->pnet));
 
         spin_lock_bh(&nft_rbtree_lock);
         for (node = rb_first(&priv->root); node != NULL; node = rb_next(node)) {
@@ -219,7 +218,7 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,
 
                 if (iter->count < iter->skip)
                         goto cont;
-                if (!nft_set_elem_active(&rbe->ext, genmask))
+                if (!nft_set_elem_active(&rbe->ext, iter->genmask))
                         goto cont;
 
                 elem.priv = rbe;