diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2024-08-22 18:27:59 +0200 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2024-08-22 18:48:44 +0200 |
| commit | 50c374c6d1a43db9444cb74cc09552c817db2a9b (patch) | |
| tree | b80c7befe92ef07799cf2dca3135afe56a6a646f /kernel/bpf/verifier.c | |
| parent | Merge branch 'support-bpf_fastcall-patterns-for-calls-to-kfuncs' (diff) | |
| parent | Merge tag 'platform-drivers-x86-v6.11-4' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-50c374c6d1a43db9444cb74cc09552c817db2a9b.tar.xz linux-50c374c6d1a43db9444cb74cc09552c817db2a9b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Cross-merge bpf fixes after downstream PR including
important fixes (from bpf-next point of view):
commit 41c24102af7b ("selftests/bpf: Filter out _GNU_SOURCE when compiling test_cpp")
commit fdad456cbcca ("bpf: Fix updating attached freplace prog in prog_array map")
No conflicts.
Adjacent changes in:
include/linux/bpf_verifier.h
kernel/bpf/verifier.c
tools/testing/selftests/bpf/Makefile
Link: https://lore.kernel.org/bpf/20240813234307.82773-1-alexei.starovoitov@gmail.com/
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf/verifier.c')
| -rw-r--r-- | kernel/bpf/verifier.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 543b8c9edac7..148536446457 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -17390,8 +17390,9 @@ static bool stacksafe(struct bpf_verifier_env *env, struct bpf_func_state *old, spi = i / BPF_REG_SIZE; if (exact != NOT_EXACT && - old->stack[spi].slot_type[i % BPF_REG_SIZE] != - cur->stack[spi].slot_type[i % BPF_REG_SIZE]) + (i >= cur->allocated_stack || + old->stack[spi].slot_type[i % BPF_REG_SIZE] != + cur->stack[spi].slot_type[i % BPF_REG_SIZE])) return false; if (!(old->stack[spi].spilled_ptr.live & REG_LIVE_READ) |