Skip to content

Commit 01f810a

Browse files
andreimateiAlexei Starovoitov
authored andcommitted
bpf: Allow variable-offset stack access
Before this patch, variable offset access to the stack was dissalowed for regular instructions, but was allowed for "indirect" accesses (i.e. helpers). This patch removes the restriction, allowing reading and writing to the stack through stack pointers with variable offsets. This makes stack-allocated buffers more usable in programs, and brings stack pointers closer to other types of pointers. The motivation is being able to use stack-allocated buffers for data manipulation. When the stack size limit is sufficient, allocating buffers on the stack is simpler than per-cpu arrays, or other alternatives. In unpriviledged programs, variable-offset reads and writes are disallowed (they were already disallowed for the indirect access case) because the speculative execution checking code doesn't support them. Additionally, when writing through a variable-offset stack pointer, if any pointers are in the accessible range, there's possilibities of later leaking pointers because the write cannot be tracked precisely. Writes with variable offset mark the whole range as initialized, even though we don't know which stack slots are actually written. This is in order to not reject future reads to these slots. Note that this doesn't affect writes done through helpers; like before, helpers need the whole stack range to be initialized to begin with. All the stack slots are in range are considered scalars after the write; variable-offset register spills are not tracked. For reads, all the stack slots in the variable range needs to be initialized (but see above about what writes do), otherwise the read is rejected. All register spilled in stack slots that might be read are marked as having been read, however reads through such pointers don't do register filling; the target register will always be either a scalar or a constant zero. Signed-off-by: Andrei Matei <andreimatei1@gmail.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Link: https://lore.kernel.org/bpf/20210207011027.676572-2-andreimatei1@gmail.com
1 parent ee5cc03 commit 01f810a

File tree

3 files changed

+518
-147
lines changed

3 files changed

+518
-147
lines changed

include/linux/bpf.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,6 +1290,11 @@ static inline bool bpf_allow_ptr_leaks(void)
12901290
return perfmon_capable();
12911291
}
12921292

1293+
static inline bool bpf_allow_uninit_stack(void)
1294+
{
1295+
return perfmon_capable();
1296+
}
1297+
12931298
static inline bool bpf_allow_ptr_to_map_access(void)
12941299
{
12951300
return perfmon_capable();

include/linux/bpf_verifier.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ struct bpf_func_state {
195195
* 0 = main function, 1 = first callee.
196196
*/
197197
u32 frameno;
198-
/* subprog number == index within subprog_stack_depth
198+
/* subprog number == index within subprog_info
199199
* zero == main subprog
200200
*/
201201
u32 subprogno;
@@ -404,6 +404,7 @@ struct bpf_verifier_env {
404404
u32 used_btf_cnt; /* number of used BTF objects */
405405
u32 id_gen; /* used to generate unique reg IDs */
406406
bool allow_ptr_leaks;
407+
bool allow_uninit_stack;
407408
bool allow_ptr_to_map_access;
408409
bool bpf_capable;
409410
bool bypass_spec_v1;

0 commit comments

Comments
 (0)