Repository: hadoop Updated Branches: refs/heads/trunk 190410085 -> 0adc3a053
YARN-6721. container-executor should have stack checking Signed-off-by: Chris Douglas <cdoug...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0adc3a05 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0adc3a05 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0adc3a05 Branch: refs/heads/trunk Commit: 0adc3a0533e90c8a42c5924be4847753e7f8d281 Parents: 1904100 Author: Allen Wittenauer <a...@apache.org> Authored: Fri Jun 23 11:39:37 2017 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Thu Aug 31 19:39:31 2017 -0700 ---------------------------------------------------------------------- .../hadoop-common/HadoopCommon.cmake | 7 ++- .../src/CMakeLists.txt | 45 ++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0adc3a05/hadoop-common-project/hadoop-common/HadoopCommon.cmake ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/HadoopCommon.cmake b/hadoop-common-project/hadoop-common/HadoopCommon.cmake index faabeed..63de1de 100644 --- a/hadoop-common-project/hadoop-common/HadoopCommon.cmake +++ b/hadoop-common-project/hadoop-common/HadoopCommon.cmake @@ -121,7 +121,9 @@ endmacro() # set the shared compiler flags # support for GNU C/C++, add other compilers as necessary -if (CMAKE_C_COMPILER_ID STREQUAL "GNU") +if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR + CMAKE_C_COMPILER_ID STREQUAL "Clang" OR + CMAKE_C_COMPILER_ID STREQUAL "AppleClang") if(NOT DEFINED GCC_SHARED_FLAGS) find_package(Threads REQUIRED) if(CMAKE_USE_PTHREADS_INIT) @@ -130,9 +132,6 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU") set(GCC_SHARED_FLAGS "-g -O2 -Wall -D_FILE_OFFSET_BITS=64") endif() endif() -elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR - CMAKE_C_COMPILER_ID STREQUAL "AppleClang") - set(GCC_SHARED_FLAGS "-g -O2 -Wall -D_FILE_OFFSET_BITS=64") endif() # Set the shared linker flags. http://git-wip-us.apache.org/repos/asf/hadoop/blob/0adc3a05/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt index 7f2b00d..3d5b506 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt @@ -53,6 +53,51 @@ if(APPLE) set(EXTRA_LIBS ${COCOA_LIBRARY}) endif(APPLE) +include(CheckCCompilerFlag) + +# Building setuid = attempt to enable stack protection. +# assumption here is that the C compiler and the C++ +# compiler match. need both so that gtest gets same +# stack treatment that the real c-e does +IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") + CHECK_C_COMPILER_FLAG("-fstack-check" STACKRESULT) + IF(STACKRESULT) + SET (CMAKE_C_FLAGS "-fstack-check ${CMAKE_C_FLAGS}") + SET (CMAKE_CXX_FLAGS "-fstack-check ${CMAKE_CXX_FLAGS}") + ENDIF() +ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR + CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + + # clang is a bit difficult here: + # - some versions don't support the flag + # - some versions support the flag, despite not having + # the library that is actually required (!) + # Notably, Xcode is a problem here. + # In the end, this is needlessly complex. :( + + SET(PRE_SANITIZE ${CMAKE_REQUIRED_FLAGS}) + SET(CMAKE_REQUIRED_FLAGS "-fsanitize=safe-stack ${CMAKE_REQUIRED_FLAGS}") + CHECK_C_COMPILER_FLAG("" STACKRESULT) + SET(CMAKE_REQUIRED_FLAGS ${PRE_SANITIZE}) + IF(STACKRESULT) + SET(CMAKE_C_FLAGS "-fsanitize=safe-stack ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "-fsanitize=safe-stack ${CMAKE_CXX_FLAGS}") + ENDIF() +ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "SunPro") + + # this appears to only be supported on SPARC, for some reason + + CHECK_C_COMPILER_FLAG("-xcheck=stkovf" STACKRESULT) + IF(STACKRESULT) + SET (CMAKE_C_FLAGS "-xcheck=stkovf ${CMAKE_C_FLAGS}") + SET (CMAKE_CXX_FLAGS "-xcheck=stkovf ${CMAKE_CXX_FLAGS}") + ENDIF() +ENDIF() + +IF(NOT STACKRESULT) + MESSAGE(WARNING "Stack Clash security protection is not suported.") +ENDIF() + function(output_directory TGT DIR) set_target_properties(${TGT} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DIR}") --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
