Domů Procházet Nápověda
Registrovat se Přihlásit se
GfA
/
linux_kernel
5
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

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 050e9baa9dc9 ("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: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Masahiro Yamada před 7 roky
rodič
a0f8c29706
revize
d148eac0e7
8 změnil soubory, kde provedl 9 přidání a 9 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 1 1
      Documentation/features/debug/stackprotector/arch-support.txt
  2. 2 2
      arch/Kconfig
  3. 1 1
      arch/arm/Kconfig
  4. 1 1
      arch/arm64/Kconfig
  5. 1 1
      arch/mips/Kconfig
  6. 1 1
      arch/sh/Kconfig
  7. 1 1
      arch/x86/Kconfig
  8. 1 1
      arch/xtensa/Kconfig

+ 1 - 1
Documentation/features/debug/stackprotector/arch-support.txt
Zobrazit soubor 

@@ -1,6 +1,6 @@
 
 #
 
 # Feature name:          stackprotector
 
-#         Kconfig:       HAVE_CC_STACKPROTECTOR
 
+#         Kconfig:       HAVE_STACKPROTECTOR
 
 #         description:   arch supports compiler driven stack overflow protection
 
 #
 
     -----------------------

+ 2 - 2
arch/Kconfig
Zobrazit soubor 

@@ -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

+ 1 - 1
arch/arm/Kconfig
Zobrazit soubor 

@@ -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

+ 1 - 1
arch/arm64/Kconfig
Zobrazit soubor 

@@ -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

+ 1 - 1
arch/mips/Kconfig
Zobrazit soubor 

@@ -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

+ 1 - 1
arch/sh/Kconfig
Zobrazit soubor 

@@ -77,7 +77,7 @@ config SUPERH32
 
 	select PERF_EVENTS
 
 	select ARCH_HIBERNATION_POSSIBLE if MMU
 
 	select SPARSE_IRQ
 
-	select HAVE_CC_STACKPROTECTOR
 
+	select HAVE_STACKPROTECTOR
 
 
 config SUPERH64
 
 	def_bool "$(ARCH)" = "sh64"

+ 1 - 1
arch/x86/Kconfig
Zobrazit soubor 

@@ -130,7 +130,6 @@ config X86
 
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64
 
 	select HAVE_ARCH_VMAP_STACK		if X86_64
 
 	select HAVE_ARCH_WITHIN_STACK_FRAMES
 
-	select HAVE_CC_STACKPROTECTOR		if CC_HAS_SANE_STACKPROTECTOR
 
 	select HAVE_CMPXCHG_DOUBLE
 
 	select HAVE_CMPXCHG_LOCAL
 
 	select HAVE_CONTEXT_TRACKING		if X86_64
 
@@ -182,6 +181,7 @@ config X86
 
 	select HAVE_RCU_TABLE_FREE
 
 	select HAVE_REGS_AND_STACK_ACCESS_API
 
 	select HAVE_RELIABLE_STACKTRACE		if X86_64 && UNWINDER_FRAME_POINTER && STACK_VALIDATION
 
+	select HAVE_STACKPROTECTOR		if CC_HAS_SANE_STACKPROTECTOR
 
 	select HAVE_STACK_VALIDATION		if X86_64
 
 	select HAVE_RSEQ
 
 	select HAVE_SYSCALL_TRACEPOINTS

+ 1 - 1
arch/xtensa/Kconfig
Zobrazit soubor 

@@ -17,7 +17,6 @@ config XTENSA
 
 	select GENERIC_SCHED_CLOCK
 
 	select GENERIC_STRNCPY_FROM_USER if KASAN
 
 	select HAVE_ARCH_KASAN if MMU
 
-	select HAVE_CC_STACKPROTECTOR
 
 	select HAVE_DEBUG_KMEMLEAK
 
 	select HAVE_DMA_CONTIGUOUS
 
 	select HAVE_EXIT_THREAD
 
@@ -28,6 +27,7 @@ config XTENSA
 
 	select HAVE_MEMBLOCK
 
 	select HAVE_OPROFILE
 
 	select HAVE_PERF_EVENTS
 
+	select HAVE_STACKPROTECTOR
 
 	select IRQ_DOMAIN
 
 	select MODULES_USE_ELF_RELA
 
 	select NO_BOOTMEM