Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Fix PTE page address mismatch in pgtable ctor/dtor

In pte_alloc_one(), pgtable_page_ctor() is passed an address that has
not been converted by page_address() to the newly allocated PTE page.

When the PTE is freed, __pte_free_tlb() calls pgtable_page_dtor()
with an address to the PTE page that has been converted by page_address().
The mismatch in the PTE's page address causes pgtable_page_dtor() to access
invalid memory, so resources for that PTE (such as the page lock) is not
properly cleaned up.

On PPC32, only SMP kernels are affected.

On PPC64, only SMP kernels with 4K page size are affected.

This bug was introduced by commit d614bb041209fd7cb5e4b35e11a7b2f6ee8f62b8
"powerpc: Move the pte free routines from common header".

On a preempt-rt kernel, a spinlock is dynamically allocated for each
PTE in pgtable_page_ctor(). When the PTE is freed, calling
pgtable_page_dtor() with a mismatched page address causes a memory leak,
as the pointer to the PTE's spinlock is bogus.

On mainline, there isn't any immediately obvious symptoms, but the
problem still exists here.

Fixes: d614bb041209fd7c "powerpc: Move the pte free routes from common header"
Cc: Paul Mackerras <paulus@samba.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-stable <stable@vger.kernel.org> # v3.10+
Signed-off-by: Hong H. Pham <hong.pham@windriver.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Hong H. Pham and committed by
Benjamin Herrenschmidt
cf77ee54 1b429835

+4 -8
+2 -4
arch/powerpc/include/asm/pgalloc-32.h
··· 84 84 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, 85 85 unsigned long address) 86 86 { 87 - struct page *page = page_address(table); 88 - 89 87 tlb_flush_pgtable(tlb, address); 90 - pgtable_page_dtor(page); 91 - pgtable_free_tlb(tlb, page, 0); 88 + pgtable_page_dtor(table); 89 + pgtable_free_tlb(tlb, page_address(table), 0); 92 90 } 93 91 #endif /* _ASM_POWERPC_PGALLOC_32_H */
+2 -4
arch/powerpc/include/asm/pgalloc-64.h
··· 148 148 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, 149 149 unsigned long address) 150 150 { 151 - struct page *page = page_address(table); 152 - 153 151 tlb_flush_pgtable(tlb, address); 154 - pgtable_page_dtor(page); 155 - pgtable_free_tlb(tlb, page, 0); 152 + pgtable_page_dtor(table); 153 + pgtable_free_tlb(tlb, page_address(table), 0); 156 154 } 157 155 158 156 #else /* if CONFIG_PPC_64K_PAGES */