[PATCH v5 05/23] powerpc32: Fix pte_offset_kernel() to return NULL for bad pages

From	Christophe Leroy <christophe.leroy@c-s.fr>
Newsgroups	linux.kernel
Subject	[PATCH v5 05/23] powerpc32: Fix pte_offset_kernel() to return NULL for bad pages
Date	2016-02-04 00:10 +0100
Message-ID	<qYeIG-fd-19@gated-at.bofh.it> (permalink)
References	<qYez0-8kz-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The fixmap related functions try to map kernel pages that are
already mapped through Large TLBs. pte_offset_kernel() has to
return NULL for LTLBs, otherwise the caller will try to access
level 2 table which doesn't exist

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
v3: new
v4: no change
v5: no change

 arch/powerpc/include/asm/nohash/32/pgtable.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
index c82cbf5..e201600 100644
--- a/arch/powerpc/include/asm/nohash/32/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
@@ -309,7 +309,8 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry)
 #define pte_index(address)		\
 	(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, addr)	\
-	((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr))
+	(pmd_bad(*(dir)) ? NULL : (pte_t *)pmd_page_vaddr(*(dir)) + \
+				  pte_index(addr))
 #define pte_offset_map(dir, addr)		\
 	((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr))
 #define pte_unmap(pte)		kunmap_atomic(pte)
-- 
2.1.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v5 05/23] powerpc32: Fix pte_offset_kernel() to return NULL  for bad pages Christophe Leroy <christophe.leroy@c-s.fr> - 2016-02-04 00:10 +0100

csiph-web