Commit 9bf297b4 authored by Ramon Nou's avatar Ramon Nou Committed by Ramon Nou
Browse files

add GSL 

restores noexecstack
Avoids the constructor with ENABLE INIT with the user library
parent 32f30a59

include/client/preload.hpp

+1 −2
Original line number Diff line number Diff line
@@ -47,13 +47,12 @@ init_preload() __attribute__((constructor)); 


void

destroy_preload() __attribute__((destructor));

#else

#elif ENABLE_INIT

void

init_libc() __attribute__((constructor));



void

destroy_libc() __attribute__((destructor));



#endif



#endif // IOINTERCEPT_PRELOAD_HPP

src/client/CMakeLists.txt

+3 −2
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ target_sources( 
target_compile_definitions(gkfs_user_lib PUBLIC BYPASS_SYSCALL)

target_link_options(gkfs_user_lib PRIVATE -z noexecstack)



target_compile_definitions(gkfs_libc_intercept PUBLIC BYPASS_SYSCALL)

target_link_options(gkfs_libc_intercept PRIVATE) #-z noexecstack

target_compile_definitions(gkfs_libc_intercept PUBLIC BYPASS_SYSCALL ENABLE_INIT)

target_link_options(gkfs_libc_intercept PRIVATE -z noexecstack)



if (GKFS_ENABLE_AGIOS)

    target_compile_definitions(gkfs_intercept PUBLIC GKFS_ENABLE_AGIOS)
@@ -158,6 +158,7 @@ target_link_libraries( 
    hermes

    fmt::fmt

    Threads::Threads

    Microsoft.GSL::GSL

)