* [PATCH 6.12.y] bpf: Add tracepoints with null-able arguments (CVE-2024-56702)
@ 2026-11-19 16:45 Yingke Xiao
2026-11-20 20:39 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Yingke Xiao @ 2026-11-19 16:45 UTC (permalink / raw)
To: stable; +Cc: bpf, memxor, sashal
[ Upstream commit c83e2d970bae ("bpf: Add tracepoints with null-able
arguments") ]
In v6.12.118, raw_tp_null_args[] in kernel/bpf/btf.c lacks nullable argument
masks for nfsd, nfs4, and bcachefs tracepoints introduced by upstream commit
c83e2d970bae (CVE-2024-56702).
Because the verifier treats raw tracepoint arguments as trusted non-NULL
pointers by default, explicit NULL checks written in BPF programs can be
optimized away, triggering kernel null pointer dereferences when tracepoints
receive NULL arguments.
Add the missing raw_tp_null_args[] entries from upstream commit c83e2d970bae
to kernel/bpf/btf.c on linux-6.12.y:
- nfsd_file_acquire (0x1001)
- nfsd_file_insert_err (0x1)
- nfsd_file_cons_err (0x1)
- nfs4_setup_sequence (0x1)
- btree_path_free (0x100)
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: Yingke Xiao <inkxiao12@gmail.com>
---
kernel/bpf/btf.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index e2fa364..55018cb 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -6498,6 +6498,8 @@ static const struct bpf_raw_tp_null_args
raw_tp_null_args[] = {
{ "sched_swap_numa", 0x100 },
/* afs */
{ "afs_make_fs_call", 0x10 },
+ /* bcachefs */
+ { "btree_path_free", 0x100 },
/* cachefiles */
{ "cachefiles_lookup", 0x1 | 0x200 },
/* netfs */
@@ -6551,6 +6553,13 @@ static const struct bpf_raw_tp_null_args
raw_tp_null_args[] = {
{ "mm_page_alloc_zone_locked", 0x1 },
/* netfs */
{ "netfs_failure", 0x10 },
+ /* nfsd */
+ { "nfsd_file_acquire", 0x1001 },
+ { "nfsd_file_insert_err", 0x1 },
+ { "nfsd_file_cons_err", 0x1 },
+ /* nfs4 */
+ { "nfs4_setup_sequence", 0x1 },
/* power */
{ "device_pm_callback_start", 0x10 },
/* qdisc */
--
2.56.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 6.12.y] bpf: Add tracepoints with null-able arguments (CVE-2024-56702)
2026-11-19 16:45 [PATCH 6.12.y] bpf: Add tracepoints with null-able arguments (CVE-2024-56702) Yingke Xiao
@ 2026-11-20 20:39 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2026-11-20 20:39 UTC (permalink / raw)
To: stable; +Cc: Sasha Levin, bpf, memxor, Yingke Xiao
> [ Upstream commit c83e2d970bae ("bpf: Add tracepoints with null-able
> arguments") ]
I can't take this one:
- The patch is whitespace-damaged and does not apply.
- It adds 5 of the entries c83e2d970bae ("bpf: Add tracepoints with
null-able arguments") adds, with no reason given for leaving the rest out.
- It lacks the "From: Jiri Olsa" line and the upstream sign-offs, and
carries a Signed-off-by from Kumar that is not on the upstream commit.
- CVE-2024-56702 is cb4158ce8ec8 ("bpf: Mark raw_tp arguments with
PTR_MAYBE_NULL"), not this commit.
Please send a backport of the full upstream commit with git send-email.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-20 20:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 16:45 [PATCH 6.12.y] bpf: Add tracepoints with null-able arguments (CVE-2024-56702) Yingke Xiao
2026-11-20 20:39 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox