Commit 90e5b346 authored by Florian Westphal's avatar Florian Westphal
Browse files

netfilter: nf_tables: deactivate catchall elements in next generation 



When flushing, individual set elements are disabled in the next
generation via the ->flush callback.

Catchall elements are not disabled.  This is incorrect and may lead to
double-deactivations of catchall elements which then results in memory
leaks:

WARNING: CPU: 1 PID: 3300 at include/net/netfilter/nf_tables.h:1172 nft_map_deactivate+0x549/0x730
CPU: 1 PID: 3300 Comm: nft Not tainted 6.5.0-rc5+ #60
RIP: 0010:nft_map_deactivate+0x549/0x730
 [..]
 ? nft_map_deactivate+0x549/0x730
 nf_tables_delset+0xb66/0xeb0

(the warn is due to nft_use_dec() detecting underflow).

Fixes: aaa31047 ("netfilter: nftables: add catch-all set element support")
Reported-by: default avatarlonial con <kongln9170@gmail.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 08713cb0

net/netfilter/nf_tables_api.c

+1 −0
Original line number Diff line number Diff line
@@ -7091,6 +7091,7 @@ static int nft_set_catchall_flush(const struct nft_ctx *ctx, 
		ret = __nft_set_catchall_flush(ctx, set, &elem);

		if (ret < 0)

			break;

		nft_set_elem_change_active(ctx->net, set, ext);

	}



	return ret;