Commit 23a3bfd4 authored Sep 10, 2023 by Pablo Neira Ayuso

netfilter: nf_tables: disallow element removal on anonymous sets



Anonymous sets need to be populated once at creation and then they are
bound to rule since 938154b9 ("netfilter: nf_tables: reject unbound
anonymous set before commit phase"), otherwise transaction reports
EINVAL.

Userspace does not need to delete elements of anonymous sets that are
not yet bound, reject this with EOPNOTSUPP.

From flush command path, skip anonymous sets, they are expected to be
bound already. Otherwise, EINVAL is hit at the end of this transaction
for unbound sets.

Fixes: 96518518 ("netfilter: add nftables")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent b079155f

net/netfilter/nf_tables_api.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -1446,8 +1446,7 @@ static int nft_flush_table(struct nft_ctx *ctx)
		if (!nft_is_active_next(ctx->net, set))
		continue;

		if (nft_set_is_anonymous(set) &&
		!list_empty(&set->bindings))
		if (nft_set_is_anonymous(set))
		continue;

		err = nft_delset(ctx, set);
		@@ -7191,8 +7190,10 @@ static int nf_tables_delsetelem(struct sk_buff *skb,
		if (IS_ERR(set))
		return PTR_ERR(set);

		if (!list_empty(&set->bindings) &&
		(set->flags & (NFT_SET_CONSTANT \| NFT_SET_ANONYMOUS)))
		if (nft_set_is_anonymous(set))
		return -EOPNOTSUPP;

		if (!list_empty(&set->bindings) && (set->flags & NFT_SET_CONSTANT))
		return -EBUSY;

		nft_ctx_init(&ctx, net, skb, info->nlh, family, table, NULL, nla);