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

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

netfilter: nf_tables: deactivate anonymous set from preparation phase 



commit c1592a89942e9678f7d9c8030efa777c0d57edab upstream.

Toggle deleted anonymous sets as inactive in the next generation, so
users cannot perform any update on it. Clear the generation bitmask
in case the transaction is aborted.

The following KASAN splat shows a set element deletion for a bound
anonymous set that has been already removed in the same transaction.

[   64.921510] ==================================================================
[   64.923123] BUG: KASAN: wild-memory-access in nf_tables_commit+0xa24/0x1490 [nf_tables]
[   64.924745] Write of size 8 at addr dead000000000122 by task test/890
[   64.927903] CPU: 3 PID: 890 Comm: test Not tainted 6.3.0+ #253
[   64.931120] Call Trace:
[   64.932699]  <TASK>
[   64.934292]  dump_stack_lvl+0x33/0x50
[   64.935908]  ? nf_tables_commit+0xa24/0x1490 [nf_tables]
[   64.937551]  kasan_report+0xda/0x120
[   64.939186]  ? nf_tables_commit+0xa24/0x1490 [nf_tables]
[   64.940814]  nf_tables_commit+0xa24/0x1490 [nf_tables]
[   64.942452]  ? __kasan_slab_alloc+0x2d/0x60
[   64.944070]  ? nf_tables_setelem_notify+0x190/0x190 [nf_tables]
[   64.945710]  ? kasan_set_track+0x21/0x30
[   64.947323]  nfnetlink_rcv_batch+0x709/0xd90 [nfnetlink]
[   64.948898]  ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink]

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f653ce4d

include/net/netfilter/nf_tables.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -471,6 +471,7 @@ struct nft_set_binding { 
};

};





enum nft_trans_phase;

enum nft_trans_phase;

void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set);

void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,

void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,

			      struct nft_set_binding *binding,

			      struct nft_set_binding *binding,

			      enum nft_trans_phase phase);

			      enum nft_trans_phase phase);

net/netfilter/nf_tables_api.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -3758,12 +3758,24 @@ void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set, 
}

}

EXPORT_SYMBOL_GPL(nf_tables_unbind_set);

EXPORT_SYMBOL_GPL(nf_tables_unbind_set);





void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set)

{

	if (nft_set_is_anonymous(set))

		nft_clear(ctx->net, set);



	set->use++;

}

EXPORT_SYMBOL_GPL(nf_tables_activate_set);



void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,

void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,

			      struct nft_set_binding *binding,

			      struct nft_set_binding *binding,

			      enum nft_trans_phase phase)

			      enum nft_trans_phase phase)

{

{

	switch (phase) {

	switch (phase) {

	case NFT_TRANS_PREPARE:

	case NFT_TRANS_PREPARE:

		if (nft_set_is_anonymous(set))

			nft_deactivate_next(ctx->net, set);



		set->use--;

		set->use--;

		return;

		return;

	case NFT_TRANS_ABORT:

	case NFT_TRANS_ABORT:

net/netfilter/nft_dynset.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -248,7 +248,7 @@ static void nft_dynset_activate(const struct nft_ctx *ctx, 
{

{

	struct nft_dynset *priv = nft_expr_priv(expr);

	struct nft_dynset *priv = nft_expr_priv(expr);





	priv->set->use++;

	nf_tables_activate_set(ctx, priv->set);

}

}





static void nft_dynset_destroy(const struct nft_ctx *ctx,

static void nft_dynset_destroy(const struct nft_ctx *ctx,

net/netfilter/nft_lookup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ static void nft_lookup_activate(const struct nft_ctx *ctx, 
{

{

	struct nft_lookup *priv = nft_expr_priv(expr);

	struct nft_lookup *priv = nft_expr_priv(expr);





	priv->set->use++;

	nf_tables_activate_set(ctx, priv->set);

}

}





static void nft_lookup_destroy(const struct nft_ctx *ctx,

static void nft_lookup_destroy(const struct nft_ctx *ctx,

net/netfilter/nft_objref.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ static void nft_objref_map_activate(const struct nft_ctx *ctx, 
{

{

	struct nft_objref_map *priv = nft_expr_priv(expr);

	struct nft_objref_map *priv = nft_expr_priv(expr);





	priv->set->use++;

	nf_tables_activate_set(ctx, priv->set);

}

}





static void nft_objref_map_destroy(const struct nft_ctx *ctx,

static void nft_objref_map_destroy(const struct nft_ctx *ctx,