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

!5816 [sync] PR-5780: bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5780 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UKT3JETAXT3EFXD2ZWVZOGHOUPJX2I7I/ 
 
https://gitee.com/src-openeuler/kernel/issues/I932VH 
 
Link:https://gitee.com/openeuler/kernel/pulls/5816

 

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

kernel/bpf/verifier.c

+4 −0
Original line number Diff line number Diff line
@@ -6091,6 +6091,10 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env, 
	}



	switch (base_type(ptr_reg->type)) {

	case PTR_TO_FLOW_KEYS:

		if (known)

			break;

		fallthrough;

	case CONST_PTR_TO_MAP:

		/* smin_val represents the known value */

		if (known && smin_val == 0 && opcode == BPF_ADD)