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

!7675 bpf: Guard stack limits against 32bit overflow 

Merge Pull Request from: @ci-robot 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3JF5BBEJCYICDC6GZ52XI6JFHMUH4HZG/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q9EW 
 
Link:https://gitee.com/openeuler/kernel/pulls/7675

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f89b6bb5 0ef2ab20

kernel/bpf/verifier.c

+2 −2
Original line number Diff line number Diff line
@@ -3917,7 +3917,7 @@ static int check_stack_access_within_bounds( 
	struct bpf_reg_state *regs = cur_regs(env);

	struct bpf_reg_state *reg = regs + regno;

	struct bpf_func_state *state = func(env, reg);

	int min_off, max_off;

	s64 min_off, max_off;

	int err;

	char *err_extra;
@@ -3930,7 +3930,7 @@ static int check_stack_access_within_bounds( 
		err_extra = " write to";



	if (tnum_is_const(reg->var_off)) {

		min_off = reg->var_off.value + off;

		min_off = (s64)reg->var_off.value + off;

		max_off = min_off + access_size;

	} else {

		if (reg->smax_value >= BPF_MAX_VAR_OFF ||