]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
riscv: bpf: Fix uninitialized symbol 'retval_off'
authorChenghao Duan <duanchenghao@kylinos.cn>
Mon, 22 Sep 2025 06:22:44 +0000 (14:22 +0800)
committerAlexei Starovoitov <ast@kernel.org>
Tue, 23 Sep 2025 19:29:03 +0000 (12:29 -0700)
In the __arch_prepare_bpf_trampoline() function, retval_off is only
meaningful when save_ret is true, so the current logic is correct.
However, in the original logic, retval_off is only initialized under
certain conditions; for example, in the fmod_ret logic, the compiler is
not aware that the flags of the fmod_ret program (prog) have set
BPF_TRAMP_F_CALL_ORIG, which results in an uninitialized symbol
compilation warning.

So initialize retval_off unconditionally to fix it.

Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
Reviewed-by: Pu Lehui <pulehui@huawei.com>
Link: https://lore.kernel.org/r/20250922062244.822937-2-duanchenghao@kylinos.cn
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
arch/riscv/net/bpf_jit_comp64.c

index 83672373d02640f5a014411867bf03335e68fcd6..d0d2768d100d6d8c3080fb639675f0a4878c66d1 100644 (file)
@@ -1061,10 +1061,9 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,
        stack_size += 16;
 
        save_ret = flags & (BPF_TRAMP_F_CALL_ORIG | BPF_TRAMP_F_RET_FENTRY_RET);
-       if (save_ret) {
+       if (save_ret)
                stack_size += 16; /* Save both A5 (BPF R0) and A0 */
-               retval_off = stack_size;
-       }
+       retval_off = stack_size;
 
        stack_size += nr_arg_slots * 8;
        args_off = stack_size;