powerpc/32: Force KASAN_VMALLOC for modules (47febbee) · Commits · 戴 / test

arch/powerpc/mm/kasan/kasan_init_32.c

+5 −26

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@
	#include <asm/code-patching.h>		#include <asm/code-patching.h>
	#include <mm/mmu_decl.h>		#include <mm/mmu_decl.h>

	static pgprot_t kasan_prot_ro(void)		static pgprot_t __init kasan_prot_ro(void)
	{		{
	if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE))		if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE))
	return PAGE_READONLY;		return PAGE_READONLY;
	@@ -20,7 +20,7 @@ static pgprot_t kasan_prot_ro(void)
	return PAGE_KERNEL_RO;		return PAGE_KERNEL_RO;
	}		}

	static void kasan_populate_pte(pte_t *ptep, pgprot_t prot)		static void __init kasan_populate_pte(pte_t *ptep, pgprot_t prot)
	{		{
	unsigned long va = (unsigned long)kasan_early_shadow_page;		unsigned long va = (unsigned long)kasan_early_shadow_page;
	phys_addr_t pa = __pa(kasan_early_shadow_page);		phys_addr_t pa = __pa(kasan_early_shadow_page);
	@@ -30,7 +30,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);		__set_pte_at(&init_mm, va, ptep, pfn_pte(PHYS_PFN(pa), prot), 0);
	}		}

	static int __ref kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_end)		static int __init kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_end)
	{		{
	pmd_t *pmd;		pmd_t *pmd;
	unsigned long k_cur, k_next;		unsigned long k_cur, k_next;
	@@ -70,7 +70,7 @@ static int __ref kasan_init_shadow_page_tables(unsigned long k_start, unsigned l
	return 0;		return 0;
	}		}

	static void __ref *kasan_get_one_page(void)		static void __init *kasan_get_one_page(void)
	{		{
	if (slab_is_available())		if (slab_is_available())
	return (void *)__get_free_page(GFP_KERNEL \| __GFP_ZERO);		return (void *)__get_free_page(GFP_KERNEL \| __GFP_ZERO);
	@@ -78,7 +78,7 @@ static void __ref *kasan_get_one_page(void)
	return memblock_alloc(PAGE_SIZE, PAGE_SIZE);		return memblock_alloc(PAGE_SIZE, PAGE_SIZE);
	}		}

	static int __ref kasan_init_region(void *start, size_t size)		static int __init kasan_init_region(void *start, size_t size)
	{		{
	unsigned long k_start = (unsigned long)kasan_mem_to_shadow(start);		unsigned long k_start = (unsigned long)kasan_mem_to_shadow(start);
	unsigned long k_end = (unsigned long)kasan_mem_to_shadow(start + size);		unsigned long k_end = (unsigned long)kasan_mem_to_shadow(start + size);
	@@ -196,27 +196,6 @@ void __init kasan_late_init(void)
	kasan_unmap_early_shadow_vmalloc();		kasan_unmap_early_shadow_vmalloc();
	}		}

	#if defined(CONFIG_MODULES) && !defined(CONFIG_KASAN_VMALLOC)
	void *module_alloc(unsigned long size)
	{
	void *base;

	base = __vmalloc_node_range(size, MODULE_ALIGN, VMALLOC_START, VMALLOC_END,
	GFP_KERNEL, PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERMS,
	NUMA_NO_NODE, __builtin_return_address(0));

	if (!base)
	return NULL;

	if (!kasan_init_region(base, size))
	return base;

	vfree(base);

	return NULL;
	}
	#endif

	#ifdef CONFIG_PPC_BOOK3S_32		#ifdef CONFIG_PPC_BOOK3S_32
	u8 __initdata early_hash[256 << 10] __aligned(256 << 10) = {0};		u8 __initdata early_hash[256 << 10] __aligned(256 << 10) = {0};

arch/powerpc/platforms/Kconfig.cputype

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,7 @@
	config PPC32		config PPC32
	bool		bool
	default y if !PPC64		default y if !PPC64
			select KASAN_VMALLOC if KASAN && MODULES

	config PPC64		config PPC64
	bool "64-bit kernel"		bool "64-bit kernel"

Admin message