Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1600526
| From | Suzuki K Poulose <suzuki.poulose@arm.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd |
| Date | 2017-03-14 16:00 +0100 |
| Message-ID | <tkW5z-1Ad-15@gated-at.bofh.it> (permalink) |
| References | <tkW5z-1Ad-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
In kvm_free_stage2_pgd() we don't hold the kvm->mmu_lock while calling
unmap_stage2_range() on the entire memory range for the guest. This could
cause problems with other callers (e.g, munmap on a memslot) trying to
unmap a range.
Fixes: commit d5d8184d35c9 ("KVM: ARM: Memory virtualization setup")
Cc: stable@vger.kernel.org # v3.10+
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
arch/arm/kvm/mmu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 13b9c1f..b361f71 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -831,7 +831,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm)
if (kvm->arch.pgd == NULL)
return;
+ spin_lock(&kvm->mmu_lock);
unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE);
+ spin_unlock(&kvm->mmu_lock);
+
/* Free the HW pgd, one page at a time */
free_pages_exact(kvm->arch.pgd, S2_PGD_SIZE);
kvm->arch.pgd = NULL;
--
2.7.4
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Suzuki K Poulose <suzuki.poulose@arm.com> - 2017-03-14 16:00 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Christoffer Dall <cdall@linaro.org> - 2017-03-15 10:30 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Marc Zyngier <marc.zyngier@arm.com> - 2017-03-15 10:40 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Marc Zyngier <marc.zyngier@arm.com> - 2017-03-15 14:30 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Christoffer Dall <cdall@linaro.org> - 2017-03-15 14:40 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Marc Zyngier <marc.zyngier@arm.com> - 2017-03-15 14:50 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Robin Murphy <robin.murphy@arm.com> - 2017-03-15 15:00 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Marc Zyngier <marc.zyngier@arm.com> - 2017-03-15 15:00 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Suzuki K Poulose <Suzuki.Poulose@arm.com> - 2017-03-15 15:40 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Marc Zyngier <marc.zyngier@arm.com> - 2017-03-15 16:10 +0100
Re: [PATCH 3/3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Christoffer Dall <cdall@linaro.org> - 2017-03-15 15:00 +0100
csiph-web