Merge tag 'powerpc-5.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

torvalds · torvalds · commit c5f1ac5e9afb · 2019-02-17T08:36:21.000-08:00
Pull powerpc fix from Michael Ellerman:
 "Just one fix, for pgd/pud_present() which were broken on big endian
  since v4.20, leading to possible data corruption.

  Thanks to: Aneesh Kumar K.V., Erhard F., Jan Kara"

* tag 'powerpc-5.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Fix possible corruption on big endian due to pgd/pud_present()
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -904,7 +904,7 @@ static inline int pud_none(pud_t pud)
 
 static inline int pud_present(pud_t pud)
 {
-	return (pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT));
+	return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT));
 }
 
 extern struct page *pud_page(pud_t pud);
@@ -951,7 +951,7 @@ static inline int pgd_none(pgd_t pgd)
 
 static inline int pgd_present(pgd_t pgd)
 {
-	return (pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT));
+	return !!(pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT));
 }
 
 static inline pte_t pgd_pte(pgd_t pgd)

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,7 @@ static inline int pud_none(pud_t pud)`
`904`	`904`
`905`	`905`	`static inline int pud_present(pud_t pud)`
`906`	`906`	`{`
`907`		`- return (pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT));`
	`907`	`+ return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT));`
`908`	`908`	`}`
`909`	`909`
`910`	`910`	`extern struct page *pud_page(pud_t pud);`
`@@ -951,7 +951,7 @@ static inline int pgd_none(pgd_t pgd)`
`951`	`951`
`952`	`952`	`static inline int pgd_present(pgd_t pgd)`
`953`	`953`	`{`
`954`		`- return (pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT));`
	`954`	`+ return !!(pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT));`
`955`	`955`	`}`
`956`	`956`
`957`	`957`	`static inline pte_t pgd_pte(pgd_t pgd)`