Commit a8fad73e authored by Florent Revest's avatar Florent Revest Committed by Alexei Starovoitov
Browse files

bpf: Remove unnecessary map checks for ARG_PTR_TO_CONST_STR 



reg->type is enforced by check_reg_type() and map should never be NULL
(it would already have been dereferenced anyway) so these checks are
unnecessary.

Reported-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarFlorent Revest <revest@chromium.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210422235543.4007694-3-revest@chromium.org
parent 8e8ee109

kernel/bpf/verifier.c

+1 −2
Original line number Diff line number Diff line
@@ -5075,8 +5075,7 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg, 
		u64 map_addr;

		char *str_ptr;



		if (reg->type != PTR_TO_MAP_VALUE || !map ||

		    !bpf_map_is_rdonly(map)) {

		if (!bpf_map_is_rdonly(map)) {

			verbose(env, "R%d does not point to a readonly map'\n", regno);

			return -EACCES;

		}