]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bpf: remove redundant REG_LIVE_READ check in stacksafe()
authorEduard Zingerman <eddyz87@gmail.com>
Fri, 19 Sep 2025 02:18:36 +0000 (19:18 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 19 Sep 2025 16:27:22 +0000 (09:27 -0700)
stacksafe() is called in exact == NOT_EXACT mode only for states that
had been porcessed by clean_verifier_states(). The latter replaces
dead stack spills with a series of STACK_INVALID masks. Such masks are
already handled by stacksafe().

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20250918-callchain-sensitive-liveness-v3-3-c3cd27bacc60@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c

index 64186ea0839bed3cb95cde090a3426c0db184b91..74a96a0d6c8a120389489ab11a8c8ac32fce3a50 100644 (file)
@@ -18785,13 +18785,6 @@ static bool stacksafe(struct bpf_verifier_env *env, struct bpf_func_state *old,
                     cur->stack[spi].slot_type[i % BPF_REG_SIZE]))
                        return false;
 
-               if (!(old->stack[spi].spilled_ptr.live & REG_LIVE_READ)
-                   && exact == NOT_EXACT) {
-                       i += BPF_REG_SIZE - 1;
-                       /* explored state didn't use this */
-                       continue;
-               }
-
                if (old->stack[spi].slot_type[i % BPF_REG_SIZE] == STACK_INVALID)
                        continue;