Unverified Commit ff5d1ff8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13299 bpf, arm64: Fix address emission with tag-based KASAN enabled 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tengda Wu <wutengda2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VD222AAZCK7VAT5DUX27EOWBGZFED6WK/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2YVC 
 
Link:https://gitee.com/openeuler/kernel/pulls/13299

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 266d39da adb92c15

arch/arm64/net/bpf_jit_comp.c

+10 −2
Original line number Diff line number Diff line
@@ -1647,6 +1647,10 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, 
	emit(A64_STR64I(A64_R(19), A64_SP, regs_off), ctx);



	if (flags & BPF_TRAMP_F_CALL_ORIG) {

		/* for the first pass, assume the worst case */

		if (!ctx->image)

			ctx->idx += 4;

		else

			emit_a64_mov_i64(A64_R(0), (const u64)im, ctx);

		emit_call((const u64)__bpf_tramp_enter, ctx);

	}
@@ -1688,6 +1692,10 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, 


	if (flags & BPF_TRAMP_F_CALL_ORIG) {

		im->ip_epilogue = ctx->image + ctx->idx;

		/* for the first pass, assume the worst case */

		if (!ctx->image)

			ctx->idx += 4;

		else

			emit_a64_mov_i64(A64_R(0), (const u64)im, ctx);

		emit_call((const u64)__bpf_tramp_exit, ctx);

	}