* [PATCH 6.12.y] Backport request: c83e2d970bae ("bpf: Add tracepoints with null-able arguments") and 6.12.y netfs_donate fix
@ 2026-11-19 5:57 梓川咲太
2026-11-19 16:08 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: 梓川咲太 @ 2026-11-19 5:57 UTC (permalink / raw)
To: stable; +Cc: bpf, gregkh, sashal
Hi Stable Maintainers,
Please consider backporting upstream commit:
c83e2d970bae ("bpf: Add tracepoints with null-able arguments")
to linux-6.12.y.
In v6.12.118 (kernel/trace/bpf_trace.c:2365-2410), raw_tp_null_args[] is
missing entries for nfsd_file_acquire (args 0, 3), nfs4_setup_sequence (arg 0),
and btree_path_free (arg 2). Additionally, 6.12.y contains
TRACE_EVENT(netfs_donate)
where argument 2 is nullable.
In live QEMU tests on v6.12.118, eBPF programs dereferencing these nullable
pointers without NULL-checks all loaded cleanly ([LOADED]), leading to kernel
NULL dereference crashes. After backporting c83e2d970bae and adding
`{ "netfs_donate", 0x100 }`, all 5 reproducers are correctly rejected by the
verifier with "invalid mem access 'trusted_ptr_or_null_'".
Note: netfs_donate was removed in mainline 6.13, so `{ "netfs_donate", 0x100 }`
is a stable-only addition required specifically for 6.12.y.
Fixes: 838a10bd2ebf ("bpf: Add bpf_raw_tp_null_args()")
Signed-off-by: BoBppy <inkxiao12@gmail.com>
---
kernel/trace/bpf_trace.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -2370,6 +2370,12 @@ static const struct bpf_raw_tp_null_args
raw_tp_null_args[] = {
+ { "netfs_donate", 0x100 },
+ { "nfsd_file_acquire", 0x1001 },
+ { "nfsd_file_insert_err", 0x1 },
+ { "nfsd_file_cons_err", 0x1 },
+ { "nfs4_setup_sequence", 0x1 },
+ { "btree_path_free", 0x100 },
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 6.12.y] Backport request: c83e2d970bae ("bpf: Add tracepoints with null-able arguments") and 6.12.y netfs_donate fix
2026-11-19 5:57 [PATCH 6.12.y] Backport request: c83e2d970bae ("bpf: Add tracepoints with null-able arguments") and 6.12.y netfs_donate fix 梓川咲太
@ 2026-11-19 16:08 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2026-11-19 16:08 UTC (permalink / raw)
To: stable; +Cc: Sasha Levin, bpf, gregkh, 梓川咲太
> In v6.12.118 (kernel/trace/bpf_trace.c:2365-2410), raw_tp_null_args[] is
> missing entries for nfsd_file_acquire (args 0, 3), nfs4_setup_sequence (arg 0),
> and btree_path_free (arg 2).
The diff edits kernel/trace/bpf_trace.c, but on 6.12 raw_tp_null_args[] lives
in kernel/bpf/btf.c, so this does not apply and the mail is not a usable patch.
Please send a proper [PATCH 6.12.y] backport of c83e2d970bae ("bpf: Add
tracepoints with null-able arguments"). The netfs_donate entry is stable-only
and would be a separate patch.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-19 16:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 5:57 [PATCH 6.12.y] Backport request: c83e2d970bae ("bpf: Add tracepoints with null-able arguments") and 6.12.y netfs_donate fix 梓川咲太
2026-11-19 16:08 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox