From: KarimAllah Ahmed <karahmed@amazon.de>
Date: Wed, 10 Jul 2019 09:13:13 +0000 (+0200)
Subject: KVM: Properly check if "page" is valid in kvm_vcpu_unmap
X-Git-Tag: Ubuntu-5.13.0-19.19~8141^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b614c6027896ff9ad6757122e84760d938cab15e;p=mirror_ubuntu-jammy-kernel.git

KVM: Properly check if "page" is valid in kvm_vcpu_unmap

The field "page" is initialized to KVM_UNMAPPED_PAGE when it is not used
(i.e. when the memory lives outside kernel control). So this check will
always end up using kunmap even for memremap regions.

Fixes: e45adf665a53 ("KVM: Introduce a new guest mapping API")
Cc: stable@vger.kernel.org
Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 9613987ef4c8..49dd5cc73d95 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1793,7 +1793,7 @@ void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map,
 	if (!map->hva)
 		return;
 
-	if (map->page)
+	if (map->page != KVM_UNMAPPED_PAGE)
 		kunmap(map->page);
 #ifdef CONFIG_HAS_IOMEM
 	else