diff options
| author | Stanislav Fomichev <sdf@google.com> | 2022-11-24 01:28:38 +0100 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2022-11-24 01:43:22 +0100 |
| commit | 5bad3587b7a292148cea10185cd8770baaeb7445 (patch) | |
| tree | 4aa63f00f5b0bfcd1c0ca144cbf6ec6ff708989b /kernel | |
| parent | bpf: Update bpf_{g,s}etsockopt() documentation (diff) | |
| download | linux-5bad3587b7a292148cea10185cd8770baaeb7445.tar.xz linux-5bad3587b7a292148cea10185cd8770baaeb7445.zip | |
bpf: Unify and simplify btf_func_proto_check error handling
Replace 'err = x; break;' with 'return x;'.
Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20221124002838.2700179-1-sdf@google.com
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/btf.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index cb43cb842e16..9dbfda2b5c6c 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4779,7 +4779,6 @@ static int btf_func_proto_check(struct btf_verifier_env *env, nr_args--; } - err = 0; for (i = 0; i < nr_args; i++) { const struct btf_type *arg_type; u32 arg_type_id; @@ -4788,8 +4787,7 @@ static int btf_func_proto_check(struct btf_verifier_env *env, arg_type = btf_type_by_id(btf, arg_type_id); if (!arg_type) { btf_verifier_log_type(env, t, "Invalid arg#%u", i + 1); - err = -EINVAL; - break; + return -EINVAL; } if (btf_type_is_resolve_source_only(arg_type)) { @@ -4802,25 +4800,23 @@ static int btf_func_proto_check(struct btf_verifier_env *env, !btf_name_valid_identifier(btf, args[i].name_off))) { btf_verifier_log_type(env, t, "Invalid arg#%u", i + 1); - err = -EINVAL; - break; + return -EINVAL; } if (btf_type_needs_resolve(arg_type) && !env_type_is_resolved(env, arg_type_id)) { err = btf_resolve(env, arg_type, arg_type_id); if (err) - break; + return err; } if (!btf_type_id_size(btf, &arg_type_id, NULL)) { btf_verifier_log_type(env, t, "Invalid arg#%u", i + 1); - err = -EINVAL; - break; + return -EINVAL; } } - return err; + return 0; } static int btf_func_check(struct btf_verifier_env *env, |