From 2b67a1da89e49ed35c9cd42840a5aab8e3806669 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Wed, 4 Jan 2017 14:59:52 -0800 Subject: [PATCH] Set CONFIG_UBSAN, add to grep test Signed-off-by: Riyaz Faizullabhoy --- alpine/base/check-kernel-config/check-kernel-config.sh | 1 + alpine/kernel/kernel_config | 5 ++++- alpine/test/test.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alpine/base/check-kernel-config/check-kernel-config.sh b/alpine/base/check-kernel-config/check-kernel-config.sh index d89f70ae2..d73bd3d24 100755 --- a/alpine/base/check-kernel-config/check-kernel-config.sh +++ b/alpine/base/check-kernel-config/check-kernel-config.sh @@ -28,6 +28,7 @@ cat unzipped_config | grep CONFIG_HARDENED_USERCOPY=y cat unzipped_config | grep CONFIG_SLAB_FREELIST_RANDOM=y cat unzipped_config | grep CONFIG_PANIC_ON_OOPS=y cat unzipped_config | grep CONFIG_DEBUG_SET_MODULE_RONX=y +cat unzipped_config | grep CONFIG_UBSAN=y # Negative cases cat unzipped_config | grep 'CONFIG_ACPI_CUSTOM_METHOD is not set' diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config index c1cb49140..a2f8268ec 100644 --- a/alpine/kernel/kernel_config +++ b/alpine/kernel/kernel_config @@ -3286,7 +3286,10 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set -# CONFIG_UBSAN is not set +CONFIG_UBSAN=y +# CONFIG_UBSAN_SANITIZE_ALL is not set +# CONFIG_UBSAN_ALIGNMENT is not set +# CONFIG_UBSAN_NULL is not set CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y diff --git a/alpine/test/test.sh b/alpine/test/test.sh index 27e5c6b95..b964eebd8 100755 --- a/alpine/test/test.sh +++ b/alpine/test/test.sh @@ -11,4 +11,4 @@ docker pull armhf/alpine docker run --rm armhf/alpine uname -a docker swarm init docker run mobylinux/check-config@sha256:4282f589d5a72004c3991c0412e45ba0ab6bb8c0c7d97dc40dabc828700e99ab -docker run mobylinux/check-kernel-config@sha256:8e89a61496317db6599e8b666319c699fe611cc855f2e468474455583265e5fd +docker run mobylinux/check-kernel-config@sha256:beabc0fd77bb9562a03104eecb34286d5aa695896e0d3e56b36876b24d2a9126