shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Skip __kvm_adjust_pc() for protected vcpus

Browse Source 
Prevent the host from issuing arbitrary PC adjustments for protected
vCPUs.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <willdeacon@google.com>
Bug: 233587962
Change-Id: I28815d1c6782abf2654ae3e931548014c842d760
This commit is contained in:
Marc Zyngier
2022-04-20 17:12:23 +01:00
committed by Will Deacon
parent c61070ca67
commit 89183fd03b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm64/kvm/hyp/nvhe/hyp-main.c
View File

@@ -259,9 +259,22 @@ out:
static void handle___kvm_adjust_pc(struct kvm_cpu_context *host_ctxt)
{
DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 1);
struct pkvm_hyp_vcpu *hyp_vcpu;
struct kvm_vcpu *host_vcpu;
__kvm_adjust_pc(kern_hyp_va(vcpu));
host_vcpu = get_host_hyp_vcpus(host_ctxt, 1, &hyp_vcpu);
if (!host_vcpu)
return;
if (hyp_vcpu) {
/* This only applies to non-protected VMs */
if (pkvm_hyp_vcpu_is_protected(hyp_vcpu))
return;
__kvm_adjust_pc(&hyp_vcpu->vcpu);
} else {
__kvm_adjust_pc(host_vcpu);
}
}
static void handle___kvm_flush_vm_context(struct kvm_cpu_context *host_ctxt)