diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-18 10:32:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-21 07:51:38 +0200 |
| commit | 2b7b0cd8d9f71bdf2d6623ead66ef2510095aa0f (patch) | |
| tree | e8321bfa0b74bf01120681036493c1abf2ca8561 /arch/sandbox | |
| parent | be03313b615d5557c9c3e0cd5c272d16df2efde0 (diff) | |
| download | barebox-2b7b0cd8d9f71bdf2d6623ead66ef2510095aa0f.tar.gz barebox-2b7b0cd8d9f71bdf2d6623ead66ef2510095aa0f.tar.xz | |
sandbox: rename KASan to ASan
sandbox really has ASan support, that is address sanitizer with the help
of the userspace library libasan. In contrast KASan is used on real
hardware where we have to implement our own support code. Rename sandbox
KASan to ASan to not clash with upcoming KASan support.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/Kconfig | 4 | ||||
| -rw-r--r-- | arch/sandbox/Makefile | 2 | ||||
| -rw-r--r-- | arch/sandbox/os/Makefile | 4 | ||||
| -rw-r--r-- | arch/sandbox/os/common.c | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 40e04919d2..81f7a96bd6 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -5,7 +5,7 @@ config SANDBOX select OFTREE select GPIOLIB select ARCH_HAS_UBSAN_SANITIZE_ALL - select HAVE_ARCH_KASAN + select HAVE_ARCH_ASAN select HAS_DMA default y @@ -22,7 +22,7 @@ config SANDBOX_UNWIND bool default y select ARCH_HAS_STACK_DUMP - depends on UBSAN || KASAN + depends on UBSAN || ASAN config PHYS_ADDR_T_64BIT bool diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 27021222dc..ce1fe3b672 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -44,7 +44,7 @@ ifeq ($(CONFIG_GPIO_LIBFTDI1),y) FTDI1_LIBS := $(shell pkg-config libftdi1 --libs) endif -ifeq ($(CONFIG_KASAN),y) +ifeq ($(CONFIG_ASAN),y) KBUILD_CPPFLAGS += -fsanitize=address SANITIZER_LIBS += -fsanitize=address endif diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index b2bd768bcb..15d688bfdd 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -8,10 +8,6 @@ KBUILD_CPPFLAGS += -DCONFIG_MALLOC_SIZE=$(CONFIG_MALLOC_SIZE) KBUILD_CFLAGS := -Wall -ifeq ($(CONFIG_KASAN),y) -KBUILD_CPPFLAGS += -DCONFIG_KASAN=1 -endif - NOSTDINC_FLAGS := ifeq ($(CONFIG_SANDBOX_LINUX_I386),y) diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 69fadb3b47..9fb5faf41d 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -347,7 +347,7 @@ int main(int argc, char *argv[]) int fdno = 0, envno = 0, option_index = 0; char *aux; -#ifdef CONFIG_KASAN +#ifdef CONFIG_ASAN __sanitizer_set_death_callback(cookmode); #endif |