Re: [PATCH bpf-next 3/4] bpf: Remove static qualifier from local subprog pointer

[Anton Protopopov <a.s.protopopov@gmail.com>]

On 26/04/08 05:37PM, Daniel Borkmann wrote:
> 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>
> ---
>  kernel/bpf/verifier.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 46f55ea6684e..6cb54764d452 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -19224,7 +19224,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;

I wonder where I copy-pasted this from... Thanks!

Acked-by: Anton Protopopov <a.s.protopopov@gmail.com>

>  	int subprog_start, subprog_end;
>  	struct bpf_iarray *jt;
>  	int i;
> @@ -19299,7 +19299,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)
> -- 
> 2.43.0