[PATCH bpf-next v3 04/11] bpf: Return -EFAULT on internal errors
From: Luis Gerhorst <hidden>
Date: 2025-05-01 07:48:26
Also in:
bpf, linux-arm-kernel, linux-kselftest, lkml
Subsystem:
bpf [core], bpf [general] (safe dynamic programs and tools), the rest · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds
This prevents us from trying to recover from these on speculative paths in the future. Signed-off-by: Luis Gerhorst <redacted> Reviewed-by: Eduard Zingerman <eddyz87@gmail.com> Acked-by: Henriette Herzog <redacted> Cc: Maximilian Ott <redacted> Cc: Milan Stephan <redacted> --- kernel/bpf/verifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index d0975169134a..9c921867f77f 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c@@ -11667,7 +11667,7 @@ static int check_helper_call(struct bpf_verifier_env *env, struct bpf_insn *insn verbose(env, "verifier internal error:"); verbose(env, "func %s has non-overwritten BPF_PTR_POISON return type\n", func_id_name(func_id)); - return -EINVAL; + return -EFAULT; } ret_btf = btf_vmlinux; ret_btf_id = *fn->ret_btf_id;
@@ -15261,12 +15261,12 @@ static int adjust_reg_min_max_vals(struct bpf_verifier_env *env, if (WARN_ON_ONCE(ptr_reg)) { print_verifier_state(env, vstate, vstate->curframe, true); verbose(env, "verifier internal error: unexpected ptr_reg\n"); - return -EINVAL; + return -EFAULT; } if (WARN_ON(!src_reg)) { print_verifier_state(env, vstate, vstate->curframe, true); verbose(env, "verifier internal error: no src_reg\n"); - return -EINVAL; + return -EFAULT; } err = adjust_scalar_min_max_vals(env, insn, dst_reg, *src_reg); if (err)
--
2.49.0