TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
commit b614c6027896ff9ad6757122e84760d938cab15e upstream.

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")
Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
KarimAllah Ahmed
2019-07-10 11:13:13 +02:00
committed by Greg Kroah-Hartman
parent e254412751
commit ec81ed2fba
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
virt/kvm/kvm_main.c
View File

@@ -1754,7 +1754,7 @@ void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map,
if (!map->hva) if (!map->hva)
return; return;
if (map->page) if (map->page != KVM_UNMAPPED_PAGE)
kunmap(map->page); kunmap(map->page);
#ifdef CONFIG_HAS_IOMEM #ifdef CONFIG_HAS_IOMEM
else else