Commit 0fea6e9a authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Linus Torvalds
Browse files

kasan, arm64: expand CONFIG_KASAN checks 

Some #ifdef CONFIG_KASAN checks are only relevant for software KASAN modes
(either related to shadow memory or compiler instrumentation).  Expand
those into CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS.

Link: https://lkml.kernel.org/r/e6971e432dbd72bb897ff14134ebb7e169bdcf0c.1606161801.git.andreyknvl@google.com


Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarAlexander Potapenko <glider@google.com>
Tested-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Marco Elver <elver@google.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8a494023

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ config BROKEN_GAS_INST 


config KASAN_SHADOW_OFFSET

	hex

	depends on KASAN

	depends on KASAN_GENERIC || KASAN_SW_TAGS

	default 0xdfff800000000000 if (ARM64_VA_BITS_48 || ARM64_VA_BITS_52) && !KASAN_SW_TAGS

	default 0xdfffc00000000000 if ARM64_VA_BITS_47 && !KASAN_SW_TAGS

	default 0xdffffe0000000000 if ARM64_VA_BITS_42 && !KASAN_SW_TAGS

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ head-y := arch/arm64/kernel/head.o 


ifeq ($(CONFIG_KASAN_SW_TAGS), y)

KASAN_SHADOW_SCALE_SHIFT := 4

else

else ifeq ($(CONFIG_KASAN_GENERIC), y)

KASAN_SHADOW_SCALE_SHIFT := 3

endif

arch/arm64/include/asm/assembler.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU 
#define NOKPROBE(x)

#endif



#ifdef CONFIG_KASAN

#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)

#define EXPORT_SYMBOL_NOKASAN(name)

#else

#define EXPORT_SYMBOL_NOKASAN(name)	EXPORT_SYMBOL(name)

arch/arm64/include/asm/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
 * address space for the shadow region respectively. They can bloat the stack

 * significantly, so double the (minimum) stack size when they are in use.

 */

#ifdef CONFIG_KASAN

#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)

#define KASAN_SHADOW_OFFSET	_AC(CONFIG_KASAN_SHADOW_OFFSET, UL)

#define KASAN_SHADOW_END	((UL(1) << (64 - KASAN_SHADOW_SCALE_SHIFT)) \

					+ KASAN_SHADOW_OFFSET)

arch/arm64/include/asm/string.h

+3 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#ifndef __ASM_STRING_H

#define __ASM_STRING_H



#ifndef CONFIG_KASAN

#if !(defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS))

#define __HAVE_ARCH_STRRCHR

extern char *strrchr(const char *, int c);
@@ -48,7 +48,8 @@ extern void *__memset(void *, int, __kernel_size_t); 
void memcpy_flushcache(void *dst, const void *src, size_t cnt);

#endif



#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)

#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \

	!defined(__SANITIZE_ADDRESS__)



/*

 * For files that are not instrumented (e.g. mm/slub.c) we