diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-18 01:56:17 +0400 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-10-10 15:07:37 +0400 |
| commit | 37b544087ef3f65ca68465ba39291a07195dac26 (patch) | |
| tree | e6fcb2b1fa3bdca8ca899c7bc515d4848a909296 /arch/arm | |
| parent | e9e8578b6cdfba0259e99e79f0cb80c55c99b3c2 (diff) | |
| download | linux-37b544087ef3f65ca68465ba39291a07195dac26.tar.xz | |
arm/arm64: KVM: fix potential NULL dereference in user_mem_abort()
Handle the potential NULL return value of find_vma_intersection()
before dereferencing it.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kvm/mmu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 8f0c7a4c49fc..bb2e110e77c0 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -776,6 +776,12 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, /* Let's check if we will get back a huge page backed by hugetlbfs */ down_read(¤t->mm->mmap_sem); vma = find_vma_intersection(current->mm, hva, hva + 1); + if (unlikely(!vma)) { + kvm_err("Failed to find VMA for hva 0x%lx\n", hva); + up_read(¤t->mm->mmap_sem); + return -EFAULT; + } + if (is_vm_hugetlb_page(vma)) { hugetlb = true; gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT; |