Commit 47c9214d authored by Menglong Dong's avatar Menglong Dong Committed by Alexei Starovoitov
Browse files

bpf: fix the usage of BPF_TRAMP_F_SKIP_FRAME 



Some places calculate the origin_call by checking if
BPF_TRAMP_F_SKIP_FRAME is set. However, it should use
BPF_TRAMP_F_ORIG_STACK for this propose. Just fix them.

Signed-off-by: default avatarMenglong Dong <dongml2@chinatelecom.cn>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/r/20251118123639.688444-4-dongml2@chinatelecom.cn


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 0c3772a8

arch/riscv/net/bpf_jit_comp64.c

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, 
	store_args(nr_arg_slots, args_off, ctx);



	/* skip to actual body of traced function */

	if (flags & BPF_TRAMP_F_SKIP_FRAME)

	if (flags & BPF_TRAMP_F_ORIG_STACK)

		orig_call += RV_FENTRY_NINSNS * 4;



	if (flags & BPF_TRAMP_F_CALL_ORIG) {

arch/x86/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -3289,7 +3289,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_im 


	arg_stack_off = stack_size;



	if (flags & BPF_TRAMP_F_SKIP_FRAME) {

	if (flags & BPF_TRAMP_F_CALL_ORIG) {

		/* skip patched call instruction and point orig_call to actual

		 * body of the kernel function.

		 */