bpf: Set meta->raw_mode for pointers close to use

If we encounter a pointer to memory, we set meta->raw_mode depending
on the type of memory we point at. What isn't obvious is that this
information is only used when the next memory size argument is
encountered.

Move the assignment closer to where it's used, and add a comment that
explains what is going on.

Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200921121227.255763-9-lmb@cloudflare.com

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index fc795bac42edc2ed0b291b7a7d656c053a548eec..446fbe7f6b491e787af7e3216ef1a6fbd08abfb5 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -4067,7 +4067,6 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
                         type != PTR_TO_RDWR_BUF &&
                         type != expected_type)
                        goto err_type;
-               meta->raw_mode = arg_type == ARG_PTR_TO_UNINIT_MEM;
        } else if (arg_type_is_alloc_mem_ptr(arg_type)) {
                expected_type = PTR_TO_MEM;
                if (register_is_null(reg) &&
@@ -4156,6 +4155,11 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
                err = check_helper_mem_access(env, regno,
                                              meta->map_ptr->value_size, false,
                                              meta);
+       } else if (arg_type_is_mem_ptr(arg_type)) {
+               /* The access to this pointer is only checked when we hit the
+                * next is_mem_size argument below.
+                */
+               meta->raw_mode = (arg_type == ARG_PTR_TO_UNINIT_MEM);
        } else if (arg_type_is_mem_size(arg_type)) {
                bool zero_size_allowed = (arg_type == ARG_CONST_SIZE_OR_ZERO);