mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 06:49:38 -04:00
Merge bitcoin/bitcoin#32071: build: Drop option to disable hardening.
77e553ab6a
build: refactor: hardening flags -> core_interface (David Gumberg)00ba3ba303
build: Drop option for disabling hardening (David Gumberg)f57db75e91
build: Use `-z noseparate-code` on NetBSD < 11.0 (David Gumberg) Pull request description: Follow up to #32038 which dropped `NO_HARDEN` from depends builds, this PR drops the `ENABLE_HARDENING` build option since disabling hardening of binaries should not be a supported or maintained use case. With this change, hardening flags are always enabled. Individual hardening flags and options can still be disabled by appending flags, e.g.: ```bash cmake -B build \ -DAPPEND_CPPFLAGS='-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -fno-stack-protector -fcf-protection=none -fno-stack-clash-protection' \ -DAPPEND_LDFLAGS='-Wl,-z,lazy -Wl,-z,norelro -Wl,-z,noseparate-code' ``` There is an issue with NetBSD 10.0's dynamic linker that makes one of the hardening linker flags, `-z separate-code`, [problematic](https://github.com/bitcoin/bitcoin/pull/28724#issuecomment-2589347934), so this PR also introduces a check to prevent the use of this flag in NetBSD versions < 11.0, (where this issue is [fixed](acf7fb3abf
)). The fix for this [might be backported](https://mail-index.netbsd.org/tech-userlevel/2023/01/05/msg013670.html) to NetBSD 10.0. I suggest reviewing the diff with whitespace changes hidden (`git diff -w` or using github's hide whitespace option) ACKs for top commit: hebasto: re-ACK77e553ab6a
. laanwj: re-ACK77e553ab6a
janb84: ACK [77e553a
](77e553ab6a
) vasild: ACK77e553ab6a
musaHaruna: tested ACK [77e553](77e553ab6a
) Tree-SHA512: b149fb0371d12312c140255bf674c2bdc9f5272a5750a5b9ec5f192323364bb2ea8e164af13b9ab981ab3aa7ceb91b7a64785081e7458470e81c2f5228abf7b1
This commit is contained in:
commit
f409444d02
2 changed files with 57 additions and 52 deletions
|
@ -128,7 +128,6 @@ if(WITH_BDB)
|
||||||
endif()
|
endif()
|
||||||
cmake_dependent_option(BUILD_WALLET_TOOL "Build bitcoin-wallet tool." ${BUILD_TESTS} "ENABLE_WALLET" OFF)
|
cmake_dependent_option(BUILD_WALLET_TOOL "Build bitcoin-wallet tool." ${BUILD_TESTS} "ENABLE_WALLET" OFF)
|
||||||
|
|
||||||
option(ENABLE_HARDENING "Attempt to harden the resulting executables." ON)
|
|
||||||
option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting executables." OFF)
|
option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting executables." OFF)
|
||||||
option(WERROR "Treat compiler warnings as errors." OFF)
|
option(WERROR "Treat compiler warnings as errors." OFF)
|
||||||
option(WITH_CCACHE "Attempt to use ccache for compiling." ON)
|
option(WITH_CCACHE "Attempt to use ccache for compiling." ON)
|
||||||
|
@ -502,14 +501,11 @@ try_append_cxx_flags("-fmacro-prefix-map=A=B" TARGET core_interface SKIP_LINK
|
||||||
# -fstack-reuse=none for all gcc builds. (Only gcc understands this flag).
|
# -fstack-reuse=none for all gcc builds. (Only gcc understands this flag).
|
||||||
try_append_cxx_flags("-fstack-reuse=none" TARGET core_interface)
|
try_append_cxx_flags("-fstack-reuse=none" TARGET core_interface)
|
||||||
|
|
||||||
if(ENABLE_HARDENING)
|
if(MSVC)
|
||||||
add_library(hardening_interface INTERFACE)
|
try_append_linker_flag("/DYNAMICBASE" TARGET core_interface)
|
||||||
target_link_libraries(core_interface INTERFACE hardening_interface)
|
try_append_linker_flag("/HIGHENTROPYVA" TARGET core_interface)
|
||||||
if(MSVC)
|
try_append_linker_flag("/NXCOMPAT" TARGET core_interface)
|
||||||
try_append_linker_flag("/DYNAMICBASE" TARGET hardening_interface)
|
else()
|
||||||
try_append_linker_flag("/HIGHENTROPYVA" TARGET hardening_interface)
|
|
||||||
try_append_linker_flag("/NXCOMPAT" TARGET hardening_interface)
|
|
||||||
else()
|
|
||||||
|
|
||||||
# _FORTIFY_SOURCE requires that there is some level of optimization,
|
# _FORTIFY_SOURCE requires that there is some level of optimization,
|
||||||
# otherwise it does nothing and just creates a compiler warning.
|
# otherwise it does nothing and just creates a compiler warning.
|
||||||
|
@ -522,42 +518,53 @@ if(ENABLE_HARDENING)
|
||||||
}"
|
}"
|
||||||
)
|
)
|
||||||
if(cxx_supports_fortify_source)
|
if(cxx_supports_fortify_source)
|
||||||
target_compile_options(hardening_interface INTERFACE
|
target_compile_options(core_interface INTERFACE
|
||||||
-U_FORTIFY_SOURCE
|
-U_FORTIFY_SOURCE
|
||||||
-D_FORTIFY_SOURCE=3
|
-D_FORTIFY_SOURCE=3
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
unset(cxx_supports_fortify_source)
|
unset(cxx_supports_fortify_source)
|
||||||
|
|
||||||
try_append_cxx_flags("-Wstack-protector" TARGET hardening_interface SKIP_LINK)
|
try_append_cxx_flags("-Wstack-protector" TARGET core_interface SKIP_LINK)
|
||||||
try_append_cxx_flags("-fstack-protector-all" TARGET hardening_interface)
|
try_append_cxx_flags("-fstack-protector-all" TARGET core_interface)
|
||||||
try_append_cxx_flags("-fcf-protection=full" TARGET hardening_interface)
|
try_append_cxx_flags("-fcf-protection=full" TARGET core_interface)
|
||||||
|
|
||||||
if(MINGW)
|
if(MINGW)
|
||||||
# stack-clash-protection is a no-op for Windows.
|
# stack-clash-protection is a no-op for Windows.
|
||||||
# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90458 for more details.
|
# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90458 for more details.
|
||||||
else()
|
else()
|
||||||
try_append_cxx_flags("-fstack-clash-protection" TARGET hardening_interface)
|
try_append_cxx_flags("-fstack-clash-protection" TARGET core_interface)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
|
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||||
try_append_cxx_flags("-mbranch-protection=bti" TARGET hardening_interface SKIP_LINK)
|
try_append_cxx_flags("-mbranch-protection=bti" TARGET core_interface SKIP_LINK)
|
||||||
else()
|
else()
|
||||||
try_append_cxx_flags("-mbranch-protection=standard" TARGET hardening_interface SKIP_LINK)
|
try_append_cxx_flags("-mbranch-protection=standard" TARGET core_interface SKIP_LINK)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
try_append_linker_flag("-Wl,--enable-reloc-section" TARGET hardening_interface)
|
try_append_linker_flag("-Wl,--enable-reloc-section" TARGET core_interface)
|
||||||
try_append_linker_flag("-Wl,--dynamicbase" TARGET hardening_interface)
|
try_append_linker_flag("-Wl,--dynamicbase" TARGET core_interface)
|
||||||
try_append_linker_flag("-Wl,--nxcompat" TARGET hardening_interface)
|
try_append_linker_flag("-Wl,--nxcompat" TARGET core_interface)
|
||||||
try_append_linker_flag("-Wl,--high-entropy-va" TARGET hardening_interface)
|
try_append_linker_flag("-Wl,--high-entropy-va" TARGET core_interface)
|
||||||
try_append_linker_flag("-Wl,-z,relro" TARGET hardening_interface)
|
try_append_linker_flag("-Wl,-z,relro" TARGET core_interface)
|
||||||
try_append_linker_flag("-Wl,-z,now" TARGET hardening_interface)
|
try_append_linker_flag("-Wl,-z,now" TARGET core_interface)
|
||||||
try_append_linker_flag("-Wl,-z,separate-code" TARGET hardening_interface)
|
# TODO: This can be dropped once Bitcoin Core no longer supports
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
# NetBSD 10.0 or if upstream fix is backported.
|
||||||
try_append_linker_flag("-Wl,-fixup_chains" TARGET hardening_interface)
|
# NetBSD's dynamic linker ld.elf_so < 11.0 supports exactly 2
|
||||||
|
# `PT_LOAD` segments and binaries linked with `-z separate-code`
|
||||||
|
# have 4 `PT_LOAD` segments.
|
||||||
|
# Relevant discussions:
|
||||||
|
# - https://github.com/bitcoin/bitcoin/pull/28724#issuecomment-2589347934
|
||||||
|
# - https://mail-index.netbsd.org/tech-userlevel/2023/01/05/msg013666.html
|
||||||
|
if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD" AND CMAKE_SYSTEM_VERSION VERSION_LESS 11.0)
|
||||||
|
try_append_linker_flag("-Wl,-z,noseparate-code" TARGET core_interface)
|
||||||
|
else()
|
||||||
|
try_append_linker_flag("-Wl,-z,separate-code" TARGET core_interface)
|
||||||
endif()
|
endif()
|
||||||
|
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||||
|
try_append_linker_flag("-Wl,-fixup_chains" TARGET core_interface)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -703,7 +710,6 @@ message("Cross compiling ....................... ${cross_status}")
|
||||||
message("C++ compiler .......................... ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}, ${CMAKE_CXX_COMPILER}")
|
message("C++ compiler .......................... ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}, ${CMAKE_CXX_COMPILER}")
|
||||||
include(FlagsSummary)
|
include(FlagsSummary)
|
||||||
flags_summary()
|
flags_summary()
|
||||||
message("Attempt to harden executables ......... ${ENABLE_HARDENING}")
|
|
||||||
message("Treat compiler warnings as errors ..... ${WERROR}")
|
message("Treat compiler warnings as errors ..... ${WERROR}")
|
||||||
message("Use ccache for compiling .............. ${WITH_CCACHE}")
|
message("Use ccache for compiling .............. ${WITH_CCACHE}")
|
||||||
message("\n")
|
message("\n")
|
||||||
|
|
|
@ -77,7 +77,6 @@
|
||||||
"BUILD_UTIL_CHAINSTATE": "ON",
|
"BUILD_UTIL_CHAINSTATE": "ON",
|
||||||
"BUILD_WALLET_TOOL": "ON",
|
"BUILD_WALLET_TOOL": "ON",
|
||||||
"ENABLE_EXTERNAL_SIGNER": "ON",
|
"ENABLE_EXTERNAL_SIGNER": "ON",
|
||||||
"ENABLE_HARDENING": "ON",
|
|
||||||
"ENABLE_WALLET": "ON",
|
"ENABLE_WALLET": "ON",
|
||||||
"WARN_INCOMPATIBLE_BDB": "OFF",
|
"WARN_INCOMPATIBLE_BDB": "OFF",
|
||||||
"WITH_BDB": "ON",
|
"WITH_BDB": "ON",
|
||||||
|
|
Loading…
Add table
Reference in a new issue