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

Commit d7e23b88 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/kasan: fix early boot failure on PPC32 



Due to commit 4a6d8cf9 ("powerpc/mm: don't use pte_alloc_kernel()
until slab is available on PPC32"), pte_alloc_kernel() cannot be used
during early KASAN init.

Fix it by using memblock_alloc() instead.

Fixes: 2edb16ef ("powerpc/32: Add KASAN support")
Cc: stable@vger.kernel.org # v5.2+
Reported-by: default avatarErhard F. <erhard_f@mailbox.org>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/da89670093651437f27d2975224712e0a130b055.1564552796.git.christophe.leroy@c-s.fr
parent 7440ea8b

arch/powerpc/mm/kasan/kasan_init_32.c

+5 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static void kasan_populate_pte(pte_t *ptep, pgprot_t prot) 
		__set_pte_at(&init_mm, va, ptep, pfn_pte(PHYS_PFN(pa), prot), 0);

}



static int kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_end)

static int __ref kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_end)

{

	pmd_t *pmd;

	unsigned long k_cur, k_next;
@@ -35,7 +35,10 @@ static int kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_ 
		if ((void *)pmd_page_vaddr(*pmd) != kasan_early_shadow_pte)

			continue;



		if (slab_is_available())

			new = pte_alloc_one_kernel(&init_mm);

		else

			new = memblock_alloc(PTE_FRAG_SIZE, PTE_FRAG_SIZE);



		if (!new)

			return -ENOMEM;