bpf, arm64: fix trampoline for BPF_TRAMP_F_CALL_ORIG
Subsystems (3)
Puranjay Mohan
maintainerPATCH 1/1 bpf, arm64: fix trampoline for BPF_TRAMP_F_CALL_ORIG
When BPF_TRAMP_F_CALL_ORIG is set, the trampoline calls __bpf_tramp_enter() and __bpf_tramp_exit() functions, passing them the struct bpf_tramp_image *im pointer as an argument in R0.
The trampoline generation code uses emit_addr_mov_i64() to emit instructions for moving the bpf_tramp_image address into R0, but emit_addr_mov_i64() assumes the address to be in the vmalloc() space and uses only 48 bits. Because bpf_tramp_image is allocated using kzalloc(), its address can use more than 48-bits, in this case the trampoline will pass an invalid address to __bpf_tramp_enter/exit() causing a kernel crash.
Fix this by using emit_a64_mov_i64() in place of emit_addr_mov_i64() as it can work with addresses that are greater than 48-bits.
--- arch/arm64/net/bpf_jit_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/net/bpf_jit_comp.c +2 -2
@@ -2141,7 +2141,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,emit (A64_STR64I (A64_R (20 ),A64_SP , regs_off +8 ), ctx);if (flags &BPF_TRAMP_F_CALL_ORIG ) { -emit_addr_mov_i64 (A64_R (0 ), (const u64 )im, ctx); +emit_a64_mov_i64 (A64_R (0 ), (const u64 )im, ctx);emit_call ((const u64 )__bpf_tramp_enter, ctx); }
@@ -2185,7 +2185,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,if (flags &BPF_TRAMP_F_CALL_ORIG ) { im->ip_epilogue = ctx->ro_image + ctx->idx; -emit_addr_mov_i64 (A64_R (0 ), (const u64 )im, ctx); +emit_a64_mov_i64 (A64_R (0 ), (const u64 )im, ctx);emit_call ((const u64 )__bpf_tramp_exit, ctx); }
Signature · 1 line
2.40.1
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 12 lines · On Thu, 11 Jul 2024 15:18:38 +0000 you wrote:
When
BPF_TRAMP_F_CALL_ORIGis set, the trampoline calls__bpf_tramp_enter()and__bpf_tramp_exit()functions, passing them the structbpf_tramp_image*im pointer as an argument in R0.The trampoline generation code uses
emit_addr_mov_i64()to emit instructions for moving thebpf_tramp_imageaddress into R0, butemit_addr_mov_i64()assumes the address to be in thevmalloc()space and uses only 48 bits. Becausebpf_tramp_imageis allocated usingkzalloc(), its address can use more than 48-bits, in this case the trampoline will pass an invalid address to __bpf_tramp_enter/exit() causing a kernel crash.
Quoted 1 line
[...]
Here is the summary with links:
- [bpf] bpf, arm64: fix trampoline for BPF_TRAMP_F_CALL_ORIG
https://git.kernel.org/bpf/bpf-next/c/19d3c179a377
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY