openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Florent Revest <revest@chromium.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210422235543.4007694-3-revest@chromium.org
This commit is contained in:
Florent Revest 2021-04-23 01:55:43 +02:00 committed by Alexei Starovoitov
parent 8e8ee109b0
commit a8fad73e33
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/bpf/verifier.c
View File

@ -5075,8 +5075,7 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
u64 map_addr; u64 map_addr;
char *str_ptr; char *str_ptr;
if (reg->type != PTR_TO_MAP_VALUE || !map || if (!bpf_map_is_rdonly(map)) {
!bpf_map_is_rdonly(map)) {
verbose(env, "R%d does not point to a readonly map'\n", regno); verbose(env, "R%d does not point to a readonly map'\n", regno);
return -EACCES; return -EACCES;
} }