Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner:
"A single fix for vmalloc_fault() which uses p*d_huge() unconditionally
whether CONFIG_HUGETLBFS is set or not. In case of CONFIG_HUGETLBFS=n
this results in a crash as p*d_huge() returns 0 in that case"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Fix vmalloc_fault to use pXd_large
+3
-3
+3
-3
arch/x86/mm/fault.c
+3
-3
arch/x86/mm/fault.c
···
330
330
if (!pmd_k)
331
331
return -1;
332
332
333
-
if (pmd_huge(*pmd_k))
333
+
if (pmd_large(*pmd_k))
334
334
return 0;
335
335
336
336
pte_k = pte_offset_kernel(pmd_k, address);
···
475
475
if (pud_none(*pud) || pud_pfn(*pud) != pud_pfn(*pud_ref))
476
476
BUG();
477
477
478
-
if (pud_huge(*pud))
478
+
if (pud_large(*pud))
479
479
return 0;
480
480
481
481
pmd = pmd_offset(pud, address);
···
486
486
if (pmd_none(*pmd) || pmd_pfn(*pmd) != pmd_pfn(*pmd_ref))
487
487
BUG();
488
488
489
-
if (pmd_huge(*pmd))
489
+
if (pmd_large(*pmd))
490
490
return 0;
491
491
492
492
pte_ref = pte_offset_kernel(pmd_ref, address);