From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:44365 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752158AbbGASXZ (ORCPT ); Wed, 1 Jul 2015 14:23:25 -0400 Subject: Patch "arm/arm64: KVM: fix potential NULL dereference in" has been added to the 3.14-stable tree To: ard.biesheuvel@linaro.org, christoffer.dall@linaro.org, gregkh@linuxfoundation.org, marc.zyngier@arm.com, shannon.zhao@linaro.org Cc: , From: Date: Wed, 01 Jul 2015 11:23:24 -0700 Message-ID: <143577500411539@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled arm/arm64: KVM: fix potential NULL dereference in to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-arm64-kvm-fix-potential-null-dereference-in.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 37b544087ef3f65ca68465ba39291a07195dac26 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 17 Sep 2014 14:56:17 -0700 Subject: arm/arm64: KVM: fix potential NULL dereference in user_mem_abort() From: Ard Biesheuvel commit 37b544087ef3f65ca68465ba39291a07195dac26 upstream. Handle the potential NULL return value of find_vma_intersection() before dereferencing it. Acked-by: Marc Zyngier Signed-off-by: Ard Biesheuvel Signed-off-by: Christoffer Dall Signed-off-by: Shannon Zhao Signed-off-by: Greg Kroah-Hartman --- arch/arm/kvm/mmu.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -778,6 +778,12 @@ static int user_mem_abort(struct kvm_vcp /* 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; Patches currently in stable-queue which might be from ard.biesheuvel@linaro.org are queue-3.14/arm-arm64-kvm-fix-potential-null-dereference-in.patch queue-3.14/arm-arm64-kvm-fix-use-of-wnr-bit-in-kvm_is_write_fault.patch