From feee30cc7133ab71ad5f30538faa5e5a4a505f92 Mon Sep 17 00:00:00 2001 From: Dirk Brandewie Date: Tue, 29 Sep 2015 07:08:58 -0700 Subject: [PATCH] kernel: kconfig: remove CUSTOM_SECURTIY meta option Change-Id: I6671760827aa1f0867be3f20a530ca50168ccc4b Signed-off-by: Dirk Brandewie Signed-off-by: Anas Nashif --- kernel/Kconfig | 7 +++---- samples/microkernel/test/test_stackprot/prj_arm.conf | 1 - samples/microkernel/test/test_stackprot/prj_x86.conf | 1 - samples/nanokernel/test/test_stackprot/prj_arc.conf | 1 - samples/nanokernel/test/test_stackprot/prj_arm.conf | 1 - samples/nanokernel/test/test_stackprot/prj_x86.conf | 1 - 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kernel/Kconfig b/kernel/Kconfig index c5fd2152207..4e385af3da5 100644 --- a/kernel/Kconfig +++ b/kernel/Kconfig @@ -127,6 +127,7 @@ config PROFILER_BUFFER_SIZE help Buffer size in 32-bit words. + menu "Profiler points" depends on KERNEL_PROFILER @@ -172,12 +173,10 @@ config CUSTOM_SECURITY config STACK_CANARIES bool - prompt "Compiler stack canaries" if CUSTOM_SECURITY + prompt "Compiler stack canaries" default n help - This option enables compiler stack canaries support on most functions - in the kernel. (Kernel functions that reside in LKMs do NOT have - stack canary support, due to limitations of the LKM technology.) + This option enables compiler stack canaries support kernel functions. If stack canaries are supported by the compiler, it will emit extra code that inserts a canary value into the stack frame when diff --git a/samples/microkernel/test/test_stackprot/prj_arm.conf b/samples/microkernel/test/test_stackprot/prj_arm.conf index b81939ca03d..7050150287e 100644 --- a/samples/microkernel/test/test_stackprot/prj_arm.conf +++ b/samples/microkernel/test/test_stackprot/prj_arm.conf @@ -1,4 +1,3 @@ -CONFIG_CUSTOM_SECURITY=y CONFIG_STACK_CANARIES=y # Let stack canaries use non-random number generator. diff --git a/samples/microkernel/test/test_stackprot/prj_x86.conf b/samples/microkernel/test/test_stackprot/prj_x86.conf index 74bf51e8016..1061a3de38b 100644 --- a/samples/microkernel/test/test_stackprot/prj_x86.conf +++ b/samples/microkernel/test/test_stackprot/prj_x86.conf @@ -1,6 +1,5 @@ # Let stack canaries use non-random number generator. # This option is NOT to be used in production code. -CONFIG_CUSTOM_SECURITY=y CONFIG_STACK_CANARIES=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/nanokernel/test/test_stackprot/prj_arc.conf b/samples/nanokernel/test/test_stackprot/prj_arc.conf index 9cb786fb991..30efacabee9 100644 --- a/samples/nanokernel/test/test_stackprot/prj_arc.conf +++ b/samples/nanokernel/test/test_stackprot/prj_arc.conf @@ -1,4 +1,3 @@ -CONFIG_CUSTOM_SECURITY=y CONFIG_STACK_CANARIES=y # Let stack canaries use non-random number generator. diff --git a/samples/nanokernel/test/test_stackprot/prj_arm.conf b/samples/nanokernel/test/test_stackprot/prj_arm.conf index b81939ca03d..7050150287e 100644 --- a/samples/nanokernel/test/test_stackprot/prj_arm.conf +++ b/samples/nanokernel/test/test_stackprot/prj_arm.conf @@ -1,4 +1,3 @@ -CONFIG_CUSTOM_SECURITY=y CONFIG_STACK_CANARIES=y # Let stack canaries use non-random number generator. diff --git a/samples/nanokernel/test/test_stackprot/prj_x86.conf b/samples/nanokernel/test/test_stackprot/prj_x86.conf index b81939ca03d..7050150287e 100644 --- a/samples/nanokernel/test/test_stackprot/prj_x86.conf +++ b/samples/nanokernel/test/test_stackprot/prj_x86.conf @@ -1,4 +1,3 @@ -CONFIG_CUSTOM_SECURITY=y CONFIG_STACK_CANARIES=y # Let stack canaries use non-random number generator.