diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2024-04-08 09:06:42 +0000 |
|---|---|---|
| committer | openeuler-sync-bot <openeuler.syncbot@gmail.com> | 2024-04-09 09:26:02 +0800 |
| commit | 24718690e893b19ff04c0148400ef4fbf6980961 (patch) | |
| tree | ea06cbc7b932ea7c8d279681e4a44c2e6295e257 | |
| parent | 87e7e0e0c3455ef6d257e0bc01fd9046b7f3e50c (diff) | |
| download | openEuler-kernel-24718690e893b19ff04c0148400ef4fbf6980961.tar.gz | |
bpf: fix check for attempt to corrupt spilled pointer
stable inclusion
from stable-v5.10.209
commit 2757f17972d87773b3677777f5682510f13c66ef
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I93ED4
CVE: CVE-2023-52462
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2757f17972d87773b3677777f5682510f13c66ef
--------------------------------
[ Upstream commit ab125ed3ec1c10ccc36bc98c7a4256ad114a3dae ]
When register is spilled onto a stack as a 1/2/4-byte register, we set
slot_type[BPF_REG_SIZE - 1] (plus potentially few more below it,
depending on actual spill size). So to check if some stack slot has
spilled register we need to consult slot_type[7], not slot_type[0].
To avoid the need to remember and double-check this in the future, just
use is_spilled_reg() helper.
Fixes: 27113c59b6d0 ("bpf: Check the other end of slot_type for STACK_SPILL")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20231205184248.1502704-4-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: Pu Lehui <pulehui@huawei.com>
(cherry picked from commit b6ff704c0d0e0db3c76c6e99aef3c2d7443f4c37)
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index b2db5ea5a0c3e8..06ed784c4e8527 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2358,7 +2358,7 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env, * so it's aligned access and [off, off + size) are within stack limits */ if (!env->allow_ptr_leaks && - state->stack[spi].slot_type[0] == STACK_SPILL && + is_spilled_reg(&state->stack[spi]) && size != BPF_REG_SIZE) { verbose(env, "attempt to corrupt spilled pointer on stack\n"); return -EACCES; |