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

Commit 1db3ea51 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Lee Jones
Browse files

BACKPORT: arm64: kasan: fix page_alloc tagging with DEBUG_VIRTUAL 



When CONFIG_DEBUG_VIRTUAL is enabled, the default page_to_virt() macro
implementation from include/linux/mm.h is used. That definition doesn't
account for KASAN tags, which leads to no tags on page_alloc allocations.

Provide an arm64-specific definition for page_to_virt() when
CONFIG_DEBUG_VIRTUAL is enabled that takes care of KASAN tags.

Bug: 254441685
Fixes: 2813b9c02962 ("kasan, mm, arm64: tag non slab memory allocated via pagealloc")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/4b55b35202706223d3118230701c6a59749d9b72.1615219501.git.andreyknvl@google.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
(cherry picked from commit 86c83365ab76e4b43cedd3ce07a07d32a4dc79ba)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I9c0b6dd75da820cfa14dff4a70709ec1f119a9af
parent 109826cc

arch/arm64/include/asm/memory.h

+5 −0
Original line number Diff line number Diff line
@@ -334,6 +334,11 @@ static inline void *phys_to_virt(phys_addr_t x) 
#define ARCH_PFN_OFFSET		((unsigned long)PHYS_PFN_OFFSET)



#ifndef CONFIG_SPARSEMEM_VMEMMAP

#define page_to_virt(x)	({						\

	__typeof__(x) __page = x;					\

	void *__addr = __va(page_to_phys(__page));			\

	(void *)__tag_set((const void *)__addr, page_kasan_tag(__page));\

})

#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)

#define _virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) >> PAGE_SHIFT)

#else