Commit af739b3b authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Jialin Zhang
Browse files

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

mainline inclusion
from mainline-v6.4
commit 26b5a571
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7H68N
CVE: CVE-2023-3117

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=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: 1240eb93 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>

conflict:
	include/net/netfilter/nf_tables.h
	net/netfilter/nf_tables_api.c

Signed-off-by: default avatarLu Wei <luwei32@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 04982868

include/net/netfilter/nf_tables.h

+2 −0
Original line number Diff line number Diff line
@@ -778,6 +778,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
@@ -971,6 +972,7 @@ struct nft_chain { 


int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain);

int nf_tables_bind_chain(const struct nft_ctx *ctx, struct nft_chain *chain);

void nf_tables_unbind_chain(const struct nft_ctx *ctx, struct nft_chain *chain);



enum nft_chain_types {

	NFT_CHAIN_T_DEFAULT = 0,

net/netfilter/nf_tables_api.c

+38 −7
Original line number Diff line number Diff line
@@ -168,7 +168,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 net *net = ctx->net;

	struct nft_trans *trans;
@@ -180,17 +181,28 @@ 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_chain_trans_bind(const struct nft_ctx *ctx, struct nft_chain *chain)

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_chain_trans_bind(const struct nft_ctx *ctx,

				   struct nft_chain *chain, bool bind)

{

	struct net *net = ctx->net;

	struct nft_trans *trans;
@@ -202,16 +214,22 @@ static void nft_chain_trans_bind(const struct nft_ctx *ctx, struct nft_chain *ch 
		switch (trans->msg_type) {

		case NFT_MSG_NEWCHAIN:

			if (nft_trans_chain(trans) == chain)

				nft_trans_chain_bound(trans) = true;

				nft_trans_chain_bound(trans) = bind;

			break;

		case NFT_MSG_NEWRULE:

			if (trans->ctx.chain == chain)

				nft_trans_rule_bound(trans) = true;

				nft_trans_rule_bound(trans) = bind;

			break;

		}

	}

}



static void nft_chain_trans_bind(const struct nft_ctx *ctx,

				 struct nft_chain *chain)

{

	__nft_chain_trans_bind(ctx, chain, true);

}



int nf_tables_bind_chain(const struct nft_ctx *ctx, struct nft_chain *chain)

{

	if (!nft_chain_binding(chain))
@@ -230,6 +248,11 @@ int nf_tables_bind_chain(const struct nft_ctx *ctx, struct nft_chain *chain) 
	return 0;

}



void nf_tables_unbind_chain(const struct nft_ctx *ctx, struct nft_chain *chain)

{

	__nft_chain_trans_bind(ctx, chain, false);

}



static int nft_netdev_register_hooks(struct net *net,

				     struct list_head *hook_list)

{
@@ -3404,7 +3427,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++) {
@@ -4534,6 +4557,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);
@@ -6460,6 +6490,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:

net/netfilter/nft_immediate.c

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ static void nft_immediate_deactivate(const struct nft_ctx *ctx, 
				nft_rule_expr_deactivate(&chain_ctx, rule, phase);



			switch (phase) {

			case NFT_TRANS_PREPARE_ERROR:

				nf_tables_unbind_chain(ctx, chain);

				fallthrough;

			case NFT_TRANS_PREPARE:

				nft_deactivate_next(ctx->net, chain);

				break;