bpf: Override the meaning of ARG_PTR_TO_MAP_VALUE for sockmap and sockhash

The verifier assumes that map values are simple blobs of memory, and
therefore treats ARG_PTR_TO_MAP_VALUE, etc. as such. However, there are
map types where this isn't true. For example, sockmap and sockhash store
sockets. In general this isn't a big problem: we can just
write helpers that explicitly requests PTR_TO_SOCKET instead of
ARG_PTR_TO_MAP_VALUE.

The one exception are the standard map helpers like map_update_elem,
map_lookup_elem, etc. Here it would be nice we could overload the
function prototype for different kinds of maps. Unfortunately, this
isn't entirely straight forward:
We only know the type of the map once we have resolved meta->map_ptr
in check_func_arg. This means we can't swap out the prototype
in check_helper_call until we're half way through the function.

Instead, modify check_func_arg to treat ARG_PTR_TO_MAP_VALUE to
mean "the native type for the map" instead of "pointer to memory"
for sockmap and sockhash. This means we don't have to modify the
function prototype at all

Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20200821102948.21918-5-lmb@cloudflare.com

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index ef938f17b94433ea820071fc9bea058eae6f9e48..f8629bf848fe322f4ac0109ea5c8836439c2e242 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -3872,6 +3872,33 @@ static int int_ptr_type_to_size(enum bpf_arg_type type)
        return -EINVAL;
 }
 
+static int resolve_map_arg_type(struct bpf_verifier_env *env,
+                                const struct bpf_call_arg_meta *meta,
+                                enum bpf_arg_type *arg_type)
+{
+       if (!meta->map_ptr) {
+               /* kernel subsystem misconfigured verifier */
+               verbose(env, "invalid map_ptr to access map->type\n");
+               return -EACCES;
+       }
+
+       switch (meta->map_ptr->map_type) {
+       case BPF_MAP_TYPE_SOCKMAP:
+       case BPF_MAP_TYPE_SOCKHASH:
+               if (*arg_type == ARG_PTR_TO_MAP_VALUE) {
+                       *arg_type = ARG_PTR_TO_SOCKET;
+               } else {
+                       verbose(env, "invalid arg_type for sockmap/sockhash\n");
+                       return -EINVAL;
+               }
+               break;
+
+       default:
+               break;
+       }
+       return 0;
+}
+
 static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
                          struct bpf_call_arg_meta *meta,
                          const struct bpf_func_proto *fn)
@@ -3904,6 +3931,14 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
                return -EACCES;
        }
 
+       if (arg_type == ARG_PTR_TO_MAP_VALUE ||
+           arg_type == ARG_PTR_TO_UNINIT_MAP_VALUE ||
+           arg_type == ARG_PTR_TO_MAP_VALUE_OR_NULL) {
+               err = resolve_map_arg_type(env, meta, &arg_type);
+               if (err)
+                       return err;
+       }
+
        if (arg_type == ARG_PTR_TO_MAP_KEY ||
            arg_type == ARG_PTR_TO_MAP_VALUE ||
            arg_type == ARG_PTR_TO_UNINIT_MAP_VALUE ||