Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Masahiro Yamada and committed by
Linus Torvalds
d148eac0 a0f8c297

+9 -9
+1 -1
Documentation/features/debug/stackprotector/arch-support.txt
··· 1 1 # 2 2 # Feature name: stackprotector 3 - # Kconfig: HAVE_CC_STACKPROTECTOR 3 + # Kconfig: HAVE_STACKPROTECTOR 4 4 # description: arch supports compiler driven stack overflow protection 5 5 # 6 6 -----------------------
+2 -2
arch/Kconfig
··· 549 549 in structures. This reduces the performance hit of RANDSTRUCT 550 550 at the cost of weakened randomization. 551 551 552 - config HAVE_CC_STACKPROTECTOR 552 + config HAVE_STACKPROTECTOR 553 553 bool 554 554 help 555 555 An arch should select this symbol if: ··· 560 560 561 561 config STACKPROTECTOR 562 562 bool "Stack Protector buffer overflow detection" 563 - depends on HAVE_CC_STACKPROTECTOR 563 + depends on HAVE_STACKPROTECTOR 564 564 depends on $(cc-option,-fstack-protector) 565 565 default y 566 566 help
+1 -1
arch/arm/Kconfig
··· 57 57 select HAVE_ARCH_TRACEHOOK 58 58 select HAVE_ARM_SMCCC if CPU_V7 59 59 select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32 60 - select HAVE_CC_STACKPROTECTOR 61 60 select HAVE_CONTEXT_TRACKING 62 61 select HAVE_C_RECORDMCOUNT 63 62 select HAVE_DEBUG_KMEMLEAK ··· 91 92 select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE) 92 93 select HAVE_REGS_AND_STACK_ACCESS_API 93 94 select HAVE_RSEQ 95 + select HAVE_STACKPROTECTOR 94 96 select HAVE_SYSCALL_TRACEPOINTS 95 97 select HAVE_UID16 96 98 select HAVE_VIRT_CPU_ACCOUNTING_GEN
+1 -1
arch/arm64/Kconfig
··· 103 103 select HAVE_ARM_SMCCC 104 104 select HAVE_EBPF_JIT 105 105 select HAVE_C_RECORDMCOUNT 106 - select HAVE_CC_STACKPROTECTOR 107 106 select HAVE_CMPXCHG_DOUBLE 108 107 select HAVE_CMPXCHG_LOCAL 109 108 select HAVE_CONTEXT_TRACKING ··· 127 128 select HAVE_PERF_USER_STACK_DUMP 128 129 select HAVE_REGS_AND_STACK_ACCESS_API 129 130 select HAVE_RCU_TABLE_FREE 131 + select HAVE_STACKPROTECTOR 130 132 select HAVE_SYSCALL_TRACEPOINTS 131 133 select HAVE_KPROBES 132 134 select HAVE_KRETPROBES
+1 -1
arch/mips/Kconfig
··· 41 41 select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT 42 42 select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS) 43 43 select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS) 44 - select HAVE_CC_STACKPROTECTOR 45 44 select HAVE_CONTEXT_TRACKING 46 45 select HAVE_COPY_THREAD_TLS 47 46 select HAVE_C_RECORDMCOUNT ··· 65 66 select HAVE_OPROFILE 66 67 select HAVE_PERF_EVENTS 67 68 select HAVE_REGS_AND_STACK_ACCESS_API 69 + select HAVE_STACKPROTECTOR 68 70 select HAVE_SYSCALL_TRACEPOINTS 69 71 select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP 70 72 select IRQ_FORCED_THREADING
+1 -1
arch/sh/Kconfig
··· 77 77 select PERF_EVENTS 78 78 select ARCH_HIBERNATION_POSSIBLE if MMU 79 79 select SPARSE_IRQ 80 - select HAVE_CC_STACKPROTECTOR 80 + select HAVE_STACKPROTECTOR 81 81 82 82 config SUPERH64 83 83 def_bool "$(ARCH)" = "sh64"
+1 -1
arch/x86/Kconfig
··· 130 130 select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64 131 131 select HAVE_ARCH_VMAP_STACK if X86_64 132 132 select HAVE_ARCH_WITHIN_STACK_FRAMES 133 - select HAVE_CC_STACKPROTECTOR if CC_HAS_SANE_STACKPROTECTOR 134 133 select HAVE_CMPXCHG_DOUBLE 135 134 select HAVE_CMPXCHG_LOCAL 136 135 select HAVE_CONTEXT_TRACKING if X86_64 ··· 181 182 select HAVE_RCU_TABLE_FREE 182 183 select HAVE_REGS_AND_STACK_ACCESS_API 183 184 select HAVE_RELIABLE_STACKTRACE if X86_64 && UNWINDER_FRAME_POINTER && STACK_VALIDATION 185 + select HAVE_STACKPROTECTOR if CC_HAS_SANE_STACKPROTECTOR 184 186 select HAVE_STACK_VALIDATION if X86_64 185 187 select HAVE_RSEQ 186 188 select HAVE_SYSCALL_TRACEPOINTS
+1 -1
arch/xtensa/Kconfig
··· 17 17 select GENERIC_SCHED_CLOCK 18 18 select GENERIC_STRNCPY_FROM_USER if KASAN 19 19 select HAVE_ARCH_KASAN if MMU 20 - select HAVE_CC_STACKPROTECTOR 21 20 select HAVE_DEBUG_KMEMLEAK 22 21 select HAVE_DMA_CONTIGUOUS 23 22 select HAVE_EXIT_THREAD ··· 27 28 select HAVE_MEMBLOCK 28 29 select HAVE_OPROFILE 29 30 select HAVE_PERF_EVENTS 31 + select HAVE_STACKPROTECTOR 30 32 select IRQ_DOMAIN 31 33 select MODULES_USE_ELF_RELA 32 34 select NO_BOOTMEM