michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: kconfig: remove CUSTOM_SECURTIY meta option

Browse source 
Change-Id: I6671760827aa1f0867be3f20a530ca50168ccc4b
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Dirk Brandewie 2015-09-29 07:08:58 -07:00 • committed by Anas Nashif
commit feee30cc71
6 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/Kconfig
View file

@ -127,6 +127,7 @@ config PROFILER_BUFFER_SIZE
help help
Buffer size in 32-bit words. Buffer size in 32-bit words.
menu "Profiler points" menu "Profiler points"
depends on KERNEL_PROFILER depends on KERNEL_PROFILER
@ -172,12 +173,10 @@ config CUSTOM_SECURITY
config STACK_CANARIES config STACK_CANARIES
bool bool
prompt "Compiler stack canaries" if CUSTOM_SECURITY prompt "Compiler stack canaries"
default n default n
help help
This option enables compiler stack canaries support on most functions This option enables compiler stack canaries support kernel functions.
in the kernel. (Kernel functions that reside in LKMs do NOT have
stack canary support, due to limitations of the LKM technology.)
If stack canaries are supported by the compiler, it will emit If stack canaries are supported by the compiler, it will emit
extra code that inserts a canary value into the stack frame when extra code that inserts a canary value into the stack frame when

1
samples/microkernel/test/test_stackprot/prj_arm.conf
View file

@ -1,4 +1,3 @@
CONFIG_CUSTOM_SECURITY=y
CONFIG_STACK_CANARIES=y CONFIG_STACK_CANARIES=y
# Let stack canaries use non-random number generator. # Let stack canaries use non-random number generator.

1
samples/microkernel/test/test_stackprot/prj_x86.conf
View file

@ -1,6 +1,5 @@
# Let stack canaries use non-random number generator. # Let stack canaries use non-random number generator.
# This option is NOT to be used in production code. # This option is NOT to be used in production code.
CONFIG_CUSTOM_SECURITY=y
CONFIG_STACK_CANARIES=y CONFIG_STACK_CANARIES=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y

1
samples/nanokernel/test/test_stackprot/prj_arc.conf
View file

@ -1,4 +1,3 @@
CONFIG_CUSTOM_SECURITY=y
CONFIG_STACK_CANARIES=y CONFIG_STACK_CANARIES=y
# Let stack canaries use non-random number generator. # Let stack canaries use non-random number generator.

1
samples/nanokernel/test/test_stackprot/prj_arm.conf
View file

@ -1,4 +1,3 @@
CONFIG_CUSTOM_SECURITY=y
CONFIG_STACK_CANARIES=y CONFIG_STACK_CANARIES=y
# Let stack canaries use non-random number generator. # Let stack canaries use non-random number generator.

1
samples/nanokernel/test/test_stackprot/prj_x86.conf
View file

@ -1,4 +1,3 @@
CONFIG_CUSTOM_SECURITY=y
CONFIG_STACK_CANARIES=y CONFIG_STACK_CANARIES=y
# Let stack canaries use non-random number generator. # Let stack canaries use non-random number generator.