|
@@ -2117,7 +2117,8 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 regno,
|
|
}
|
|
}
|
|
|
|
|
|
if (arg_type == ARG_PTR_TO_MAP_KEY ||
|
|
if (arg_type == ARG_PTR_TO_MAP_KEY ||
|
|
- arg_type == ARG_PTR_TO_MAP_VALUE) {
|
|
|
|
|
|
+ arg_type == ARG_PTR_TO_MAP_VALUE ||
|
|
|
|
+ arg_type == ARG_PTR_TO_UNINIT_MAP_VALUE) {
|
|
expected_type = PTR_TO_STACK;
|
|
expected_type = PTR_TO_STACK;
|
|
if (!type_is_pkt_pointer(type) && type != PTR_TO_MAP_VALUE &&
|
|
if (!type_is_pkt_pointer(type) && type != PTR_TO_MAP_VALUE &&
|
|
type != expected_type)
|
|
type != expected_type)
|
|
@@ -2187,7 +2188,8 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 regno,
|
|
err = check_helper_mem_access(env, regno,
|
|
err = check_helper_mem_access(env, regno,
|
|
meta->map_ptr->key_size, false,
|
|
meta->map_ptr->key_size, false,
|
|
NULL);
|
|
NULL);
|
|
- } else if (arg_type == ARG_PTR_TO_MAP_VALUE) {
|
|
|
|
|
|
+ } else if (arg_type == ARG_PTR_TO_MAP_VALUE ||
|
|
|
|
+ arg_type == ARG_PTR_TO_UNINIT_MAP_VALUE) {
|
|
/* bpf_map_xxx(..., map_ptr, ..., value) call:
|
|
/* bpf_map_xxx(..., map_ptr, ..., value) call:
|
|
* check [value, value + map->value_size) validity
|
|
* check [value, value + map->value_size) validity
|
|
*/
|
|
*/
|
|
@@ -2196,9 +2198,10 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 regno,
|
|
verbose(env, "invalid map_ptr to access map->value\n");
|
|
verbose(env, "invalid map_ptr to access map->value\n");
|
|
return -EACCES;
|
|
return -EACCES;
|
|
}
|
|
}
|
|
|
|
+ meta->raw_mode = (arg_type == ARG_PTR_TO_UNINIT_MAP_VALUE);
|
|
err = check_helper_mem_access(env, regno,
|
|
err = check_helper_mem_access(env, regno,
|
|
meta->map_ptr->value_size, false,
|
|
meta->map_ptr->value_size, false,
|
|
- NULL);
|
|
|
|
|
|
+ meta);
|
|
} else if (arg_type_is_mem_size(arg_type)) {
|
|
} else if (arg_type_is_mem_size(arg_type)) {
|
|
bool zero_size_allowed = (arg_type == ARG_CONST_SIZE_OR_ZERO);
|
|
bool zero_size_allowed = (arg_type == ARG_CONST_SIZE_OR_ZERO);
|
|
|
|
|