Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6721. container-executor should have stack checking 

Signed-off-by: Chris Douglas <cdouglas@apache.org>
This commit is contained in:
Allen Wittenauer 2017-06-23 11:39:37 -07:00
parent 190410085b
commit 0adc3a0533
No known key found for this signature in database
GPG Key ID: E01B34FBE846DF38
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-common-project/hadoop-common/HadoopCommon.cmake
View File

@ -121,7 +121,9 @@ endmacro()
# set the shared compiler flags # set the shared compiler flags
# support for GNU C/C++, add other compilers as necessary # 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) if(NOT DEFINED GCC_SHARED_FLAGS)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
if(CMAKE_USE_PTHREADS_INIT) 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") set(GCC_SHARED_FLAGS "-g -O2 -Wall -D_FILE_OFFSET_BITS=64")
endif() endif()
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() endif()
# Set the shared linker flags. # Set the shared linker flags.

45
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
View File

@ -53,6 +53,51 @@ if(APPLE)
set(EXTRA_LIBS ${COCOA_LIBRARY}) set(EXTRA_LIBS ${COCOA_LIBRARY})
endif(APPLE) 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) function(output_directory TGT DIR)
set_target_properties(${TGT} PROPERTIES set_target_properties(${TGT} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DIR}") RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DIR}")