netfilter: nf_tables: add nft_chain_add() (04b7db41) · Commits · 戴 / test

net/netfilter/nf_tables_api.c

+20 −8

Original line number	Diff line number	Diff line
		@@ -1914,6 +1914,20 @@ static int nft_basechain_init(struct nft_base_chain *basechain, u8 family,
		return 0;
		}

		static int nft_chain_add(struct nft_table table, struct nft_chain chain)
		{
		int err;

		err = rhltable_insert_key(&table->chains_ht, chain->name,
		&chain->rhlhead, nft_chain_ht_params);
		if (err)
		return err;

		list_add_tail_rcu(&chain->list, &table->chains);

		return 0;
		}

		static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,
		u8 policy, u32 flags)
		{
		@@ -1991,16 +2005,9 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,
		if (err < 0)
		goto err1;

		err = rhltable_insert_key(&table->chains_ht, chain->name,
		&chain->rhlhead, nft_chain_ht_params);
		if (err)
		goto err2;

		trans = nft_trans_chain_add(ctx, NFT_MSG_NEWCHAIN);
		if (IS_ERR(trans)) {
		err = PTR_ERR(trans);
		rhltable_remove(&table->chains_ht, &chain->rhlhead,
		nft_chain_ht_params);
		goto err2;
		}

		@@ -2008,8 +2015,13 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,
		if (nft_is_base_chain(chain))
		nft_trans_chain_policy(trans) = policy;

		err = nft_chain_add(table, chain);
		if (err < 0) {
		nft_trans_destroy(trans);
		goto err2;
		}

		table->use++;
		list_add_tail_rcu(&chain->list, &table->chains);

		return 0;
		err2: