Commit18a9552

toshikani

authored and

KAGA-KOKO

committed

x86/mm: Fix vmalloc_fault to use pXd_large

Gratian Crisan reported that vmalloc_fault() crashes when CONFIG_HUGETLBFSis not set since the function inadvertently uses pXn_huge(), which alwaysreturn 0 in this case. ioremap() does not depend on CONFIG_HUGETLBFS.Fix vmalloc_fault() to call pXd_large() instead.Fixes:f4eafd8 ("x86/mm: Fix vmalloc_fault() to handle large pages properly")Reported-by: Gratian Crisan <gratian.crisan@ni.com>Signed-off-by: Toshi Kani <toshi.kani@hpe.com>Signed-off-by: Thomas Gleixner <tglx@linutronix.de>Cc: stable@vger.kernel.orgCc: linux-mm@kvack.orgCc: Borislav Petkov <bp@alien8.de>Cc: Andy Lutomirski <luto@kernel.org>Link:https://lkml.kernel.org/r/20180313170347.3829-2-toshi.kani@hpe.com

1 parentfc6eabb commit18a9552Copy full SHA for 18a9552

File tree

1 file changed

-3

lines changed

arch/x86/mm
- fault.c

1 file changed

-3

lines changed

`‎arch/x86/mm/fault.c‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ static noinline int vmalloc_fault(unsigned long address)`
`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`	`return0;`
`335`	`335`
`336`	`336`	`pte_k=pte_offset_kernel(pmd_k,address);`
`@@ -475,7 +475,7 @@ static noinline int vmalloc_fault(unsigned long 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`	`return0;`
`480`	`480`
`481`	`481`	`pmd=pmd_offset(pud,address);`
`@@ -486,7 +486,7 @@ static noinline int vmalloc_fault(unsigned long 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`	`return0;`
`491`	`491`
`492`	`492`	`pte_ref=pte_offset_kernel(pmd_ref,address);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit18a9552

File tree

1 file changed

1 file changed

`‎arch/x86/mm/fault.c‎`

0 commit comments