x86/mm: Fix vmalloc_fault to use pXd_large

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=18a955219bf7d9008ce480d4451b6b8bf4483a22
Commit:     18a955219bf7d9008ce480d4451b6b8bf4483a22
Parent:     fc6eabbbf8ef99efed778dd5afabc83c21dba585
Author:     Toshi Kani <toshi.kani at hpe.com>
AuthorDate: Tue Mar 13 11:03:46 2018 -0600
Committer:  Thomas Gleixner <tglx at linutronix.de>
CommitDate: Wed Mar 14 20:22:42 2018 +0100

    x86/mm: Fix vmalloc_fault to use pXd_large
    
    Gratian Crisan reported that vmalloc_fault() crashes when CONFIG_HUGETLBFS
    is not set since the function inadvertently uses pXn_huge(), which always
    return 0 in this case.  ioremap() does not depend on CONFIG_HUGETLBFS.
    
    Fix vmalloc_fault() to call pXd_large() instead.
    
    Fixes: f4eafd8bcd52 ("x86/mm: Fix vmalloc_fault() to handle large pages properly")
    Reported-by: Gratian Crisan <gratian.crisan at ni.com>
    Signed-off-by: Toshi Kani <toshi.kani at hpe.com>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: stable at vger.kernel.org
    Cc: linux-mm at kvack.org
    Cc: Borislav Petkov <bp at alien8.de>
    Cc: Andy Lutomirski <luto at kernel.org>
    Link: https://lkml.kernel.org/r/20180313170347.3829-2-toshi.kani@hpe.com
---
 arch/x86/mm/fault.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index c88573d90f3e..25a30b5d6582 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -330,7 +330,7 @@ static noinline int vmalloc_fault(unsigned long address)
 	if (!pmd_k)
 		return -1;
 
-	if (pmd_huge(*pmd_k))
+	if (pmd_large(*pmd_k))
 		return 0;
 
 	pte_k = pte_offset_kernel(pmd_k, address);
@@ -475,7 +475,7 @@ static noinline int vmalloc_fault(unsigned long address)
 	if (pud_none(*pud) || pud_pfn(*pud) != pud_pfn(*pud_ref))
 		BUG();
 
-	if (pud_huge(*pud))
+	if (pud_large(*pud))
 		return 0;
 
 	pmd = pmd_offset(pud, address);
@@ -486,7 +486,7 @@ static noinline int vmalloc_fault(unsigned long address)
 	if (pmd_none(*pmd) || pmd_pfn(*pmd) != pmd_pfn(*pmd_ref))
 		BUG();
 
-	if (pmd_huge(*pmd))
+	if (pmd_large(*pmd))
 		return 0;
 
 	pte_ref = pte_offset_kernel(pmd_ref, address);