]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bpf: Remove static qualifier from local subprog pointer
authorDaniel Borkmann <daniel@iogearbox.net>
Wed, 8 Apr 2026 19:12:41 +0000 (21:12 +0200)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 9 Apr 2026 01:43:28 +0000 (18:43 -0700)
The local subprog pointer in create_jt() and visit_abnormal_return_insn()
was declared static.

It is unconditionally assigned via bpf_find_containing_subprog() before
every use. Thus, the static qualifier serves no purpose and rather creates
confusion. Just remove it.

Fixes: e40f5a6bf88a ("bpf: correct stack liveness for tail calls")
Fixes: 493d9e0d6083 ("bpf, x86: add support for indirect jumps")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Anton Protopopov <a.s.protopopov@gmail.com>
Link: https://lore.kernel.org/r/20260408191242.526279-3-daniel@iogearbox.net
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c

index fffb38a441e09bbc929c7e0c82e2cbb0ebe56964..1227b168bb0786969ee047cb005aec5a1d7d9c69 100644 (file)
@@ -19225,7 +19225,7 @@ static struct bpf_iarray *jt_from_subprog(struct bpf_verifier_env *env,
 static struct bpf_iarray *
 create_jt(int t, struct bpf_verifier_env *env)
 {
-       static struct bpf_subprog_info *subprog;
+       struct bpf_subprog_info *subprog;
        int subprog_start, subprog_end;
        struct bpf_iarray *jt;
        int i;
@@ -19300,7 +19300,7 @@ static int visit_gotox_insn(int t, struct bpf_verifier_env *env)
  */
 static int visit_abnormal_return_insn(struct bpf_verifier_env *env, int t)
 {
-       static struct bpf_subprog_info *subprog;
+       struct bpf_subprog_info *subprog;
        struct bpf_iarray *jt;
 
        if (env->insn_aux_data[t].jt)