summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@kernel.org>2026-11-02 20:26:02 +0000
committerAlexei Starovoitov <ast@kernel.org>2026-11-02 20:26:02 +0000
commit29f85bba33ff515e2c084450ec4b1ccc53550d5d (patch)
tree01728adb9dc2a074153fe6e0c4e7a22797577f5b /include/linux
parent8ed2506a7c2712142e4ee37bc82f018741cf4b9c (diff)
parentc820e6f70d12db780018234da79fe0c20d785052 (diff)
Merge branch 'bpf-fix-the-stack-buffer-that-bpf_dynptr_slice_rdwr-returns'
Alexei Starovoitov says: ==================== bpf: Fix the stack buffer that bpf_dynptr_slice_rdwr() returns From: Alexei Starovoitov <ast@kernel.org> bpf_dynptr_slice_rdwr() and bpf_dynptr_slice() can return the buffer. When the buffer is on the stack, the prog has two pointers to the same stack slot, and the verifier knows only one of them. A store through the slice changes data that the verifier tracks in the slot: a known scalar, a spilled pointer, a dynptr, an iterator. Such a prog loads today and can crash the kernel. A load through the slice reads such data as a scalar. Patch 1 invalidates the slice when the prog stores to the buffer, or when the frame of the buffer returns. Patch 2 has the tests. The selftests that pass a stack buffer to the kfuncs only read the buffer after the call. They load as before, with the same number of processed insns. Cilium and sched-ext/scx do not use the kfuncs. test_progs and test_verifier have no new failure. v1 -> v2: - Read-only slices of bpf_dynptr_slice() follow the same rule (Sashiko). - Tests for read-only slices, one of them with a file dynptr. The progs end with a load through the slice. - Shorter tests: a macro for the callees, less in the run-time test. v1: https://lore.kernel.org/bpf/20261102055543.3584718-1-alexei.starovoitov@gmail.com/ Signed-off-by: Alexei Starovoitov <ast@kernel.org> ==================== Link: https://patch.msgid.link/20261102170958.3586893-1-alexei.starovoitov@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bpf_verifier.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h
index 33dc3d402057..228a3f6889c2 100644
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
@@ -50,6 +50,13 @@ enum bpf_iter_state {
BPF_ITER_STATE_DRAINED,
};
+/* Bytes [off, off + size) of the stack of frame frameno. Nothing when size is 0. */
+struct bpf_stack_range {
+ u32 frameno;
+ s32 off;
+ u32 size;
+};
+
struct bpf_reg_state {
/* Ordering of fields matters. See states_equal() */
enum bpf_reg_type type;
@@ -83,6 +90,12 @@ struct bpf_reg_state {
struct { /* for PTR_TO_MEM | PTR_TO_MEM_OR_NULL */
u32 mem_size;
+ /*
+ * bpf_dynptr_slice() and bpf_dynptr_slice_rdwr() return the
+ * buffer when the data is not contiguous: the register may
+ * point to this part of the stack.
+ */
+ struct bpf_stack_range buf;
};
/* For dynptr stack slots */
@@ -1091,6 +1104,8 @@ struct bpf_verifier_env {
bool bypass_spec_v1;
bool bypass_spec_v4;
bool seen_direct_write;
+ /* a register may point to the stack and is not PTR_TO_STACK, see bpf_reg_state::buf */
+ bool seen_stack_slice;
/* a global function is verified for BPF_FUNC_CTX_NO_RCU_LOCK */
bool no_rcu_read_lock;
bool seen_exception;
@@ -1815,6 +1830,8 @@ struct bpf_call_arg_meta {
struct arg_constant_desc arg_constant;
/* The type of the dynptr that the kfunc writes through */
enum bpf_dynptr_type dynptr_write_type;
+ /* The buffer of bpf_dynptr_slice() or bpf_dynptr_slice_rdwr() */
+ struct bpf_stack_range slice_buf;
/* arg_{btf,btf_id,owning_ref} are used by kfunc-specific handling,
* generally to pass info about user-defined local kptr types to later