From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] arm/arm64: KVM: fix potential NULL dereference in user_mem_abort()
Date: Wed, 17 Sep 2014 14:56:17 -0700 [thread overview]
Message-ID: <1410990981-665-3-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1410990981-665-1-git-send-email-ard.biesheuvel@linaro.org>
Handle the potential NULL return value of find_vma_intersection()
before dereferencing it.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/kvm/mmu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 152e0f896e63..c093e95ff7ef 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -776,7 +776,11 @@ 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 (is_vm_hugetlb_page(vma)) {
+ if (unlikely(!vma)) {
+ kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
+ up_read(¤t->mm->mmap_sem);
+ return -EFAULT;
+ } else if (is_vm_hugetlb_page(vma)) {
hugetlb = true;
gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
} else {
--
1.8.3.2
next prev parent reply other threads:[~2014-09-17 21:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-17 21:56 [PATCH 0/6] KVM: handling of MMIO pass-through regions Ard Biesheuvel
2014-09-17 21:56 ` [PATCH 1/6] arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages Ard Biesheuvel
2014-09-29 13:02 ` Christoffer Dall
2014-10-09 12:59 ` Marc Zyngier
2014-09-17 21:56 ` Ard Biesheuvel [this message]
2014-09-29 13:01 ` [PATCH 2/6] arm/arm64: KVM: fix potential NULL dereference in user_mem_abort() Christoffer Dall
2014-10-09 13:05 ` Marc Zyngier
2014-10-09 13:10 ` Ard Biesheuvel
2014-10-09 13:11 ` Christoffer Dall
2014-10-09 13:13 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 3/6] arm/arm64: KVM: add 'writable' parameter to kvm_phys_addr_ioremap Ard Biesheuvel
2014-09-25 0:03 ` Mario Smarduch
2014-09-29 12:23 ` Christoffer Dall
2014-09-29 18:02 ` Mario Smarduch
2014-09-29 18:26 ` Christoffer Dall
2014-09-29 12:59 ` Christoffer Dall
2014-10-09 13:07 ` Marc Zyngier
2014-10-09 13:11 ` Ard Biesheuvel
2014-10-09 13:46 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 4/6] ARM: kvm: define PAGE_S2_DEVICE as read-only by default Ard Biesheuvel
2014-09-29 13:05 ` Christoffer Dall
2014-10-09 13:10 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 5/6] arm64: " Ard Biesheuvel
2014-09-29 13:06 ` Christoffer Dall
2014-09-29 13:34 ` Will Deacon
2014-10-09 13:10 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 6/6] arm/arm64: KVM: map MMIO regions at creation time Ard Biesheuvel
2014-09-29 12:52 ` Christoffer Dall
2014-09-29 13:07 ` [PATCH 0/6] KVM: handling of MMIO pass-through regions Christoffer Dall
2014-10-01 5:36 ` Ard Biesheuvel
2014-10-10 11:08 ` Christoffer Dall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410990981-665-3-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.