Unverified Commit 9be6ae39 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14704 bpf: Fix narrow scalar spill onto 64-bit spilled scalar slots 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Zhongjin <chenzhongjin@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3VXVKJOT7AHNVIOBBYJQ4GMCHRY34MNW/ 
 
https://gitee.com/openeuler/kernel/issues/IBFYC8 
 
Link:https://gitee.com/openeuler/kernel/pulls/14704

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 70bb9f3c 06050851

kernel/bpf/verifier.c

+1 −0
Original line number Diff line number Diff line
@@ -2681,6 +2681,7 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env, 
	 */

	if (!env->allow_ptr_leaks &&

	    is_spilled_reg(&state->stack[spi]) &&

	    !is_spilled_scalar_reg(&state->stack[spi]) &&

	    size != BPF_REG_SIZE) {

		verbose(env, "attempt to corrupt spilled pointer on stack\n");

		return -EACCES;