tree 6cdee10d27cded6815072c8b35f95f88faf8183d
parent f3567042b10a7ef4d60edb2a9ab904297f091355
author Florian Westphal <fw@strlen.de> 1691838316 +0200
committer Oleksandr Tymoshenko <ovt@google.com> 1695335390 +0000

netfilter: nf_tables: deactivate catchall elements in next generation

[ Upstream commit 90e5b3462efa37b8bba82d7c4e63683856e188af ]

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).

BUG=b/298762236
TEST=presubmit
RELEASE_NOTE=Fixed CVE-2023-4569 in the Linux kernel

cos-patch: security-high
Fixes: aaa31047a6d2 ("netfilter: nftables: add catch-all set element support")
Reported-by: lonial con <kongln9170@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Change-Id: I4245c6d5257b19c3ed3839ce25c0cdfe4c66487f
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/57507
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Michael Kochera <kochera@google.com>