Commit 683b96f9 authored by Eduard Zingerman's avatar Eduard Zingerman Committed by Alexei Starovoitov
Browse files

bpf: extract __check_reg_arg() utility function 



Split check_reg_arg() into two utility functions:
- check_reg_arg() operating on registers from current verifier state;
- __check_reg_arg() operating on a specific set of registers passed as
  a parameter;

The __check_reg_arg() function would be used by a follow-up change for
callbacks handling.

Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20231121020701.26440-5-eddyz87@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent f40bfd16

kernel/bpf/verifier.c

+13 −6
Original line number Diff line number Diff line
@@ -3439,13 +3439,11 @@ static void mark_insn_zext(struct bpf_verifier_env *env, 
	reg->subreg_def = DEF_NOT_SUBREG;

}









static int check_reg_arg(struct bpf_verifier_env *env, u32 regno,









static int __check_reg_arg(struct bpf_verifier_env *env, struct bpf_reg_state *regs, u32 regno,









			   enum reg_arg_type t)









{









	struct bpf_verifier_state *vstate = env->cur_state;









	struct bpf_func_state *state = vstate->frame[vstate->curframe];









	struct bpf_insn *insn = env->prog->insnsi + env->insn_idx;









	struct bpf_reg_state *reg, *regs = state->regs;









	struct bpf_reg_state *reg;









	bool rw64;

















	if (regno >= MAX_BPF_REG) {








@@ -3486,6 +3484,15 @@ static int check_reg_arg(struct bpf_verifier_env *env, u32 regno,







	return 0;









}

















static int check_reg_arg(struct bpf_verifier_env *env, u32 regno,









			 enum reg_arg_type t)









{









	struct bpf_verifier_state *vstate = env->cur_state;









	struct bpf_func_state *state = vstate->frame[vstate->curframe];

















	return __check_reg_arg(env, state->regs, regno, t);









}

















static void mark_jmp_point(struct bpf_verifier_env *env, int idx)









{









	env->insn_aux_data[idx].jmp_point = true;








@@ -9350,7 +9357,7 @@ static void clear_caller_saved_regs(struct bpf_verifier_env *env,







	/* after the call registers r0 - r5 were scratched */









	for (i = 0; i < CALLER_SAVED_REGS; i++) {









		mark_reg_not_init(env, regs, caller_saved[i]);









		check_reg_arg(env, caller_saved[i], DST_OP_NO_MARK);









		__check_reg_arg(env, regs, caller_saved[i], DST_OP_NO_MARK);









	}









}