Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d148eac0 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds
Browse files

Kbuild: rename HAVE_CC_STACKPROTECTOR config variable 



HAVE_CC_STACKPROTECTOR should be selected by architectures with stack
canary implementation.  It is not about the compiler support.

For the consistency with commit 050e9baa ("Kbuild: rename
CC_STACKPROTECTOR[_STRONG] config variables"), remove 'CC_' from the
config symbol.

I moved the 'select' lines to keep the alphabetical sorting.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0f8c297

Documentation/features/debug/stackprotector/arch-support.txt

+1 −1
Original line number Diff line number Diff line 
#

# Feature name:          stackprotector

#         Kconfig:       HAVE_CC_STACKPROTECTOR

#         Kconfig:       HAVE_STACKPROTECTOR

#         description:   arch supports compiler driven stack overflow protection

#

    -----------------------

arch/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ config GCC_PLUGIN_RANDSTRUCT_PERFORMANCE 
	  in structures.  This reduces the performance hit of RANDSTRUCT

	  at the cost of weakened randomization.



config HAVE_CC_STACKPROTECTOR

config HAVE_STACKPROTECTOR

	bool

	help

	  An arch should select this symbol if:
@@ -560,7 +560,7 @@ config CC_HAS_STACKPROTECTOR_NONE 


config STACKPROTECTOR

	bool "Stack Protector buffer overflow detection"

	depends on HAVE_CC_STACKPROTECTOR

	depends on HAVE_STACKPROTECTOR

	depends on $(cc-option,-fstack-protector)

	default y

	help

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ config ARM 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARM_SMCCC if CPU_V7

	select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CONTEXT_TRACKING

	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_KMEMLEAK
@@ -92,6 +91,7 @@ config ARM 
	select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RSEQ

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UID16

	select HAVE_VIRT_CPU_ACCOUNTING_GEN

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ config ARM64 
	select HAVE_ARM_SMCCC

	select HAVE_EBPF_JIT

	select HAVE_C_RECORDMCOUNT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_CONTEXT_TRACKING
@@ -128,6 +127,7 @@ config ARM64 
	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RCU_TABLE_FREE

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_KPROBES

	select HAVE_KRETPROBES

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ config MIPS 
	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)

	select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CONTEXT_TRACKING

	select HAVE_COPY_THREAD_TLS

	select HAVE_C_RECORDMCOUNT
@@ -66,6 +65,7 @@ config MIPS 
	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP

	select IRQ_FORCED_THREADING