From 80912256a0d8e8d1979db41a73a4a93185b06ed3 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 14 Aug 2019 13:52:50 +0100 Subject: [PATCH] Fix presence of executable stack markings for hardened systems See https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart. --- CMakeLists.txt | 2 +- src/{xbox_shutdown_patch.s => xbox_shutdown_patch.S} | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) rename src/{xbox_shutdown_patch.s => xbox_shutdown_patch.S} (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf631f84..29d092fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ if (IS_ARMHF_BUILD) target_sources(mcpelauncher-client PRIVATE src/armhf_support.cpp src/armhf_support.h) target_compile_definitions(mcpelauncher-client PRIVATE USE_ARMHF_SUPPORT) else() - target_sources(mcpelauncher-client PRIVATE src/cpuid.cpp src/cpuid.h src/xbox_shutdown_patch.cpp src/xbox_shutdown_patch.h src/xbox_shutdown_patch.s src/texel_aa_patch.cpp src/texel_aa_patch.h) + target_sources(mcpelauncher-client PRIVATE src/cpuid.cpp src/cpuid.h src/xbox_shutdown_patch.cpp src/xbox_shutdown_patch.h src/xbox_shutdown_patch.S src/texel_aa_patch.cpp src/texel_aa_patch.h) endif() install(TARGETS mcpelauncher-client RUNTIME COMPONENT mcpelauncher-client DESTINATION bin) diff --git a/src/xbox_shutdown_patch.s b/src/xbox_shutdown_patch.S similarity index 90% rename from src/xbox_shutdown_patch.s rename to src/xbox_shutdown_patch.S index 90bb2056..9dc31f76 100644 --- a/src/xbox_shutdown_patch.s +++ b/src/xbox_shutdown_patch.S @@ -38,3 +38,7 @@ xbox_shutdown_patch_run_one_hook_2_1_9: mov ecx, [esp+0x5C] mov eax, [ecx+0xC] ret + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif