netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx

commit 8965d42bcf54d42cbc72fe34a9d0ec3f8527debd upstream.

It would be better to not store nft_ctx inside nft_trans object,
the netlink ctx strucutre is huge and most of its information is
never needed in places that use trans->ctx.

Avoid/reduce its usage if possible, no runtime behaviour change
intended.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index cb13e604dc347b0c6883a713f371e3150d0a9190..25dd157728a35763245b7e3342ce8643461dee56 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1018,7 +1018,7 @@ static inline bool nft_chain_is_bound(struct nft_chain *chain)
 
 int nft_chain_add(struct nft_table *table, struct nft_chain *chain);
 void nft_chain_del(struct nft_chain *chain);
-void nf_tables_chain_destroy(struct nft_ctx *ctx);
+void nf_tables_chain_destroy(struct nft_chain *chain);
 
 struct nft_stats {
        u64                     bytes;

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 04fda8c14e0419718a80ff6d54790a48b40c66dd..1e84c856445014ac0eadd3575ba89e14f5605a49 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1911,9 +1911,9 @@ static void nf_tables_chain_free_chain_rules(struct nft_chain *chain)
        kvfree(chain->rules_next);
 }
 
-void nf_tables_chain_destroy(struct nft_ctx *ctx)
+void nf_tables_chain_destroy(struct nft_chain *chain)
 {
-       struct nft_chain *chain = ctx->chain;
+       const struct nft_table *table = chain->table;
        struct nft_hook *hook, *next;
 
        if (WARN_ON(chain->use > 0))
@@ -1925,7 +1925,7 @@ void nf_tables_chain_destroy(struct nft_ctx *ctx)
        if (nft_is_base_chain(chain)) {
                struct nft_base_chain *basechain = nft_base_chain(chain);
 
-               if (nft_base_chain_netdev(ctx->family, basechain->ops.hooknum)) {
+               if (nft_base_chain_netdev(table->family, basechain->ops.hooknum)) {
                        list_for_each_entry_safe(hook, next,
                                                 &basechain->hook_list, list) {
                                list_del_rcu(&hook->list);
@@ -2367,7 +2367,7 @@ err_unregister_hook:
 err_use:
        nf_tables_unregister_hook(net, table, chain);
 err_destroy_chain:
-       nf_tables_chain_destroy(ctx);
+       nf_tables_chain_destroy(chain);
 
        return err;
 }
@@ -7999,7 +7999,7 @@ static void nft_commit_release(struct nft_trans *trans)
                kfree(nft_trans_chain_name(trans));
                break;
        case NFT_MSG_DELCHAIN:
-               nf_tables_chain_destroy(&trans->ctx);
+               nf_tables_chain_destroy(nft_trans_chain(trans));
                break;
        case NFT_MSG_DELRULE:
                nf_tables_rule_destroy(&trans->ctx, nft_trans_rule(trans));
@@ -8840,7 +8840,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)
                nf_tables_table_destroy(&trans->ctx);
                break;
        case NFT_MSG_NEWCHAIN:
-               nf_tables_chain_destroy(&trans->ctx);
+               nf_tables_chain_destroy(nft_trans_chain(trans));
                break;
        case NFT_MSG_NEWRULE:
                nf_tables_rule_destroy(&trans->ctx, nft_trans_rule(trans));
@@ -9574,7 +9574,7 @@ int __nft_release_basechain(struct nft_ctx *ctx)
        }
        nft_chain_del(ctx->chain);
        nft_use_dec(&ctx->table->use);
-       nf_tables_chain_destroy(ctx);
+       nf_tables_chain_destroy(ctx->chain);
 
        return 0;
 }
@@ -9646,10 +9646,9 @@ static void __nft_release_table(struct net *net, struct nft_table *table)
                nft_obj_destroy(&ctx, obj);
        }
        list_for_each_entry_safe(chain, nc, &table->chains, list) {
-               ctx.chain = chain;
                nft_chain_del(chain);
                nft_use_dec(&table->use);
-               nf_tables_chain_destroy(&ctx);
+               nf_tables_chain_destroy(chain);
        }
        list_del(&table->list);
        nf_tables_table_destroy(&ctx);

diff --git a/net/netfilter/nft_immediate.c b/net/netfilter/nft_immediate.c
index d154fe67ca8a6309d0282d6ecd6a74eed39c74d6..a889cf1d863ef393158cf64f2a52411c9045c11f 100644 (file)
--- a/net/netfilter/nft_immediate.c
+++ b/net/netfilter/nft_immediate.c
@@ -221,7 +221,7 @@ static void nft_immediate_destroy(const struct nft_ctx *ctx,
                        list_del(&rule->list);
                        nf_tables_rule_destroy(&chain_ctx, rule);
                }
-               nf_tables_chain_destroy(&chain_ctx);
+               nf_tables_chain_destroy(chain);
                break;
        default:
                break;