mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH nf] netfilter: bpf: reject a repeated bpf_ct_set_nat_info()
@ 2026-11-20 17:13 Andrey Misiurov
  0 siblings, 0 replies; only message in thread
From: Andrey Misiurov @ 2026-11-20 17:13 UTC (permalink / raw)
  To: Pablo Neira Ayuso, Florian Westphal
  Cc: Jozsef Kadlecsik, Phil Sutter, Fernando Fernandez Mancera,
	netfilter-devel, coreteam, linux-kernel, amisiurov

bpf_ct_set_nat_info() checks the l3 protocol and the manip type and then
calls nf_nat_setup_info(). It does not check whether NAT for that manip was
already set up.

A BPF program holding an unconfirmed nf_conn___init can call it twice with
the same manip. The first call sets IPS_SRC_NAT_DONE (or IPS_DST_NAT_DONE).
On the second call nf_nat_setup_info() hits WARN_ON(nf_nat_initialized()):

  WARNING: CPU: 1 PID: 21673 at net/netfilter/nf_nat_core.c:674 nf_nat_setup_info+0x251/0x2b0 [nf_nat]
  CPU: 1 PID: 21673 Comm: loader
  RIP: 0010:nf_nat_setup_info+0x251/0x2b0 [nf_nat]
  Call Trace:
   bpf_ct_set_nat_info+0x81/0xb0 [nf_nat]
   bpf_prog_e4b00ba35d2f7a6b_nf_skb_ct_nat_twice+0x110/0x13f
   bpf_test_run+0x172/0x2e0
   bpf_prog_test_run_skb+0x2e5/0x4f0
   __sys_bpf+0x7f8/0xe90
   __x64_sys_bpf+0x1a/0x30
   do_syscall_64+0x5f/0xe0
   entry_SYSCALL_64_after_hwframe+0x76/0x7e

With panic_on_warn this is a DoS.

Reject the call with -EEXIST when NAT for that manip is already initialised,
before nf_nat_setup_info() is reached.

Fixes: 0fabd2aa199f ("net: netfilter: add bpf_ct_set_nat_info kfunc helper")
Signed-off-by: Andrey Misiurov <amisiurov@cloudlinux.com>
---
v2:
- Correct the Fixes tag to 0fabd2aa199f (the helper that added the kfunc),
  not the later manip-type check (Fernando Fernandez Mancera).
- Drop the inline comment; the check is self-documenting (Fernando).
- Reword the commit message (no "confirmed check" in this path).

Found during a backport review.

Reproduced on almalinux9 5.14.0-687.61.1 with a BPF_PROG_TEST_RUN SCHED_CLS
prog that calls bpf_ct_set_nat_info() with NF_NAT_MANIP_SRC twice: without
the fix the second call returns -ENOMEM and WARNs as above; with the fix it
returns -EEXIST and there is no WARN.

 net/netfilter/nf_nat_bpf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/netfilter/nf_nat_bpf.c b/net/netfilter/nf_nat_bpf.c
--- a/net/netfilter/nf_nat_bpf.c
+++ b/net/netfilter/nf_nat_bpf.c
@@ -42,6 +42,9 @@
 	if (manip != NF_NAT_MANIP_SRC && manip != NF_NAT_MANIP_DST)
 		return -EINVAL;

+	if (nf_nat_initialized(ct, manip))
+		return -EEXIST;
+
 	memset(&range, 0, sizeof(struct nf_nat_range2));
 	range.flags = NF_NAT_RANGE_MAP_IPS;
 	range.min_addr = *addr;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-20 17:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 17:13 [PATCH nf] netfilter: bpf: reject a repeated bpf_ct_set_nat_info() Andrey Misiurov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®