diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-10-24 16:33:38 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-27 11:32:43 +0000 |
| commit | 68b824e428c5fb5c3dc5ef80b1543e767534b58e (patch) | |
| tree | 93f0cc373bf871d0eddcdef77fc5ca0d8bb17c8c /arch/arm64/kvm | |
| parent | 7cd0aaafaadcaaf280887f8b478393a9fcfc69e3 (diff) | |
| download | linux-68b824e428c5fb5c3dc5ef80b1543e767534b58e.tar.gz linux-68b824e428c5fb5c3dc5ef80b1543e767534b58e.tar.bz2 linux-68b824e428c5fb5c3dc5ef80b1543e767534b58e.zip | |
KVM: arm64: Patch kimage_voffset instead of loading the EL1 value
Directly using the kimage_voffset variable is fine for now, but
will become more problematic as we start distrusting EL1.
Instead, patch the kimage_voffset into the HYP text, ensuring
we don't have to load an untrusted value later on.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/host.S | 5 | ||||
| -rw-r--r-- | arch/arm64/kvm/va_layout.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S index ed27f06a31ba..4e207c1c5126 100644 --- a/arch/arm64/kvm/hyp/nvhe/host.S +++ b/arch/arm64/kvm/hyp/nvhe/host.S @@ -115,10 +115,7 @@ SYM_FUNC_END(__hyp_do_panic) * Preserve x0-x4, which may contain stub parameters. */ ldr x5, =__kvm_handle_stub_hvc - ldr_l x6, kimage_voffset - - /* x5 = __pa(x5) */ - sub x5, x5, x6 + kimg_pa x5, x6 br x5 .L__vect_end\@: .if ((.L__vect_end\@ - .L__vect_start\@) > 0x80) diff --git a/arch/arm64/kvm/va_layout.c b/arch/arm64/kvm/va_layout.c index 1d00d2cb93fd..d61117805de0 100644 --- a/arch/arm64/kvm/va_layout.c +++ b/arch/arm64/kvm/va_layout.c @@ -251,3 +251,9 @@ void kvm_update_kimg_phys_offset(struct alt_instr *alt, { generate_mov_q(kimage_voffset + PHYS_OFFSET, origptr, updptr, nr_inst); } + +void kvm_get_kimage_voffset(struct alt_instr *alt, + __le32 *origptr, __le32 *updptr, int nr_inst) +{ + generate_mov_q(kimage_voffset, origptr, updptr, nr_inst); +} |