Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be00ed72 authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood
Browse files

powerpc32: Fix pte_offset_kernel() to return NULL for bad pages 



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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent 516d9189

arch/powerpc/include/asm/nohash/32/pgtable.h

+2 −1
Original line number Diff line number Diff line
@@ -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)