UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2018-03-18 12:01:14 -07:00
parent d2149e13e5 18a955219b
commit df4fe17802
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/mm/fault.c
View File

@ -330,7 +330,7 @@ static noinline int vmalloc_fault(unsigned long address)
if (!pmd_k) if (!pmd_k)
return -1; return -1;
if (pmd_huge(*pmd_k)) if (pmd_large(*pmd_k))
return 0; return 0;
pte_k = pte_offset_kernel(pmd_k, address); 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)) if (pud_none(*pud) || pud_pfn(*pud) != pud_pfn(*pud_ref))
BUG(); BUG();
if (pud_huge(*pud)) if (pud_large(*pud))
return 0; return 0;
pmd = pmd_offset(pud, address); 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)) if (pmd_none(*pmd) || pmd_pfn(*pmd) != pmd_pfn(*pmd_ref))
BUG(); BUG();
if (pmd_huge(*pmd)) if (pmd_large(*pmd))
return 0; return 0;
pte_ref = pte_offset_kernel(pmd_ref, address); pte_ref = pte_offset_kernel(pmd_ref, address);