From 85bd4ec7870bc842f67c2d93d47a5b7ab7ce3261 Mon Sep 17 00:00:00 2001 From: Fuad Tabba Date: Wed, 19 Jan 2022 13:11:20 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Only call kvm_shadow_destroy() in protected mode Non-protected mode doesn't have a shadow state. Bug: 220829442 Signed-off-by: Fuad Tabba Change-Id: I38f7eb94a8fd02cc796b943cdcda4ff379b1bb64 --- arch/arm64/kvm/arm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index c243b9304083..2adca153ad68 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -230,7 +230,9 @@ void kvm_arch_destroy_vm(struct kvm *kvm) bitmap_free(kvm->arch.pmu_filter); kvm_vgic_destroy(kvm); - kvm_shadow_destroy(kvm); + + if (is_protected_kvm_enabled()) + kvm_shadow_destroy(kvm); for (i = 0; i < KVM_MAX_VCPUS; ++i) { if (kvm->vcpus[i]) {