Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df28fde authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain 



[ 26b5a5712eb85e253724e56a54c17f8519bd8e4e ]

Add a new state to deal with rule expressions deactivation from the
newrule error path, otherwise the anonymous set remains in the list in
inactive state for the next generation. Mark the set/chain transaction
as unbound so the abort path releases this object, set it as inactive in
the next generation so it is not reachable anymore from this transaction
and reference counter is dropped.

Fixes: 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1adb5c27

include/net/netfilter/nf_tables.h

+1 −0
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ struct nft_expr_type { 


enum nft_trans_phase {

	NFT_TRANS_PREPARE,

	NFT_TRANS_PREPARE_ERROR,

	NFT_TRANS_ABORT,

	NFT_TRANS_COMMIT,

	NFT_TRANS_RELEASE

net/netfilter/nf_tables_api.c

+23 −4
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ static void nft_trans_destroy(struct nft_trans *trans) 
	kfree(trans);

}



static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set)

static void __nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set,

				 bool bind)

{

	struct nftables_pernet *nft_net;

	struct net *net = ctx->net;
@@ -151,16 +152,26 @@ static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set) 
		switch (trans->msg_type) {

		case NFT_MSG_NEWSET:

			if (nft_trans_set(trans) == set)

				nft_trans_set_bound(trans) = true;

				nft_trans_set_bound(trans) = bind;

			break;

		case NFT_MSG_NEWSETELEM:

			if (nft_trans_elem_set(trans) == set)

				nft_trans_elem_set_bound(trans) = true;

				nft_trans_elem_set_bound(trans) = bind;

			break;

		}

	}

}



static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set)

{

	return __nft_set_trans_bind(ctx, set, true);

}



static void nft_set_trans_unbind(const struct nft_ctx *ctx, struct nft_set *set)

{

	return __nft_set_trans_bind(ctx, set, false);

}



static void nft_trans_commit_list_add_tail(struct net *net, struct nft_trans *trans)

{

	struct nftables_pernet *nft_net;
@@ -2939,7 +2950,7 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk, 


	return 0;

err2:

	nft_rule_expr_deactivate(&ctx, rule, NFT_TRANS_PREPARE);

	nft_rule_expr_deactivate(&ctx, rule, NFT_TRANS_PREPARE_ERROR);

	nf_tables_rule_destroy(&ctx, rule);

err1:

	for (i = 0; i < n; i++) {
@@ -3959,6 +3970,13 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, 
			      enum nft_trans_phase phase)

{

	switch (phase) {

	case NFT_TRANS_PREPARE_ERROR:

		nft_set_trans_unbind(ctx, set);

		if (nft_set_is_anonymous(set))

			nft_deactivate_next(ctx->net, set);



		set->use--;

		break;

	case NFT_TRANS_PREPARE:

		if (nft_set_is_anonymous(set))

			nft_deactivate_next(ctx->net, set);
@@ -5724,6 +5742,7 @@ void nf_tables_deactivate_flowtable(const struct nft_ctx *ctx, 
				    enum nft_trans_phase phase)

{

	switch (phase) {

	case NFT_TRANS_PREPARE_ERROR:

	case NFT_TRANS_PREPARE:

	case NFT_TRANS_ABORT:

	case NFT_TRANS_RELEASE: