bpf: abort verification if env->cur_state->loop_entry != NULL

[ Upstream commit f3c2d243a36ef23be07bc2bce7c6a5cb6e07d9e3 ]

In addition to warning abort verification with -EFAULT.
If env->cur_state->loop_entry != NULL something is irrecoverably
buggy.

Fixes: bbbc02b7445e ("bpf: copy_verifier_state() should copy 'loop_entry' field")
Suggested-by: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20250225003838.135319-1-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 4392436ba75119bb93477caaca15fa7345fa5f62..1841467c4f2e547a9492febbaee3a199fdfa3742 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -19265,8 +19265,10 @@ process_bpf_exit:
                                                return err;
                                        break;
                                } else {
-                                       if (WARN_ON_ONCE(env->cur_state->loop_entry))
-                                               env->cur_state->loop_entry = NULL;
+                                       if (WARN_ON_ONCE(env->cur_state->loop_entry)) {
+                                               verbose(env, "verifier bug: env->cur_state->loop_entry != NULL\n");
+                                               return -EFAULT;
+                                       }
                                        do_print_state = true;
                                        continue;
                                }