diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2021-04-23 19:58:22 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-04-23 19:58:22 +0300 |
| commit | b1b9f535c48f5c20a0f6c218c11199b64347c0a6 (patch) | |
| tree | 8282ba0f8b0229af59a7e21bdc5b61b83405dde5 | |
| parent | e7a1c1300891d8f11d05b42665e299cc22a4b383 (diff) | |
| parent | a8fad73e3334151196acb28c4dcde37732c82542 (diff) | |
| download | linux-b1b9f535c48f5c20a0f6c218c11199b64347c0a6.tar.xz | |
Merge branch 'Simplify bpf_snprintf verifier code'
Florent Revest says:
====================
Alexei requested a couple of cleanups to the bpf_snprintf and
ARG_PTR_TO_CONST_STR verifier code.
https://lore.kernel.org/bpf/CABRcYmL_SMT80UTyV98bRsOzW0wBd1sZcYUpTrcOAV+9m+YoWQ@mail.gmail.com/T/#t
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
| -rw-r--r-- | kernel/bpf/verifier.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 58730872f7e5..2579f6fbb5c3 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -5075,8 +5075,7 @@ skip_type_check: 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; } @@ -5940,8 +5939,10 @@ static int check_bpf_snprintf_call(struct bpf_verifier_env *env, fmt_map_off = fmt_reg->off + fmt_reg->var_off.value; err = fmt_map->ops->map_direct_value_addr(fmt_map, &fmt_addr, fmt_map_off); - if (err) - return err; + if (err) { + verbose(env, "verifier bug\n"); + return -EFAULT; + } fmt = (char *)(long)fmt_addr + fmt_map_off; /* We are also guaranteed that fmt+fmt_map_off is NULL terminated, we |