Cypher_Stack/RandomWOW
2
0
Fork 0
mirror of https://git.wownero.com/wownero/RandomWOW.git synced 2025-01-03 13:48:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226 from jtgrassie/fix-non-arm-osx

Browse Source 
Fix W^X policy for apple portability
This commit is contained in:
hyc 2021-11-19 06:08:38 +00:00 committed by GitHub
commit b0d4807420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/virtual_memory.cpp
View File

@ -36,7 +36,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach/vm_statistics.h> #include <mach/vm_statistics.h>
#include <TargetConditionals.h> #include <TargetConditionals.h>
# ifdef TARGET_OS_OSX #include <AvailabilityMacros.h>
# if TARGET_OS_OSX
# define USE_PTHREAD_JIT_WP 1 # define USE_PTHREAD_JIT_WP 1
# include <pthread.h> # include <pthread.h>
# endif # endif
@ -114,8 +115,11 @@ void* allocMemoryPages(std::size_t bytes) {
mem = mmap(nullptr, bytes, PAGE_READWRITE | RESERVED_FLAGS | PEXTRA, MAP_ANONYMOUS | MAP_PRIVATE | MEXTRA, -1, 0); mem = mmap(nullptr, bytes, PAGE_READWRITE | RESERVED_FLAGS | PEXTRA, MAP_ANONYMOUS | MAP_PRIVATE | MEXTRA, -1, 0);
if (mem == MAP_FAILED) if (mem == MAP_FAILED)
throw std::runtime_error("allocMemoryPages - mmap failed"); throw std::runtime_error("allocMemoryPages - mmap failed");
#ifdef USE_PTHREAD_JIT_WP #if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \
&& MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0
if (__builtin_available(macOS 11.0, *)) {
pthread_jit_write_protect_np(false); pthread_jit_write_protect_np(false);
}
#endif #endif
#endif #endif
return mem; return mem;
@ -134,16 +138,26 @@ static inline void pageProtect(void* ptr, std::size_t bytes, int rules) {
} }
void setPagesRW(void* ptr, std::size_t bytes) { void setPagesRW(void* ptr, std::size_t bytes) {
#ifdef USE_PTHREAD_JIT_WP #if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \
&& MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0
if (__builtin_available(macOS 11.0, *)) {
pthread_jit_write_protect_np(false); pthread_jit_write_protect_np(false);
} else {
pageProtect(ptr, bytes, PAGE_READWRITE);
}
#else #else
pageProtect(ptr, bytes, PAGE_READWRITE); pageProtect(ptr, bytes, PAGE_READWRITE);
#endif #endif
} }
void setPagesRX(void* ptr, std::size_t bytes) { void setPagesRX(void* ptr, std::size_t bytes) {
#ifdef USE_PTHREAD_JIT_WP #if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \
&& MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0
if (__builtin_available(macOS 11.0, *)) {
pthread_jit_write_protect_np(true); pthread_jit_write_protect_np(true);
} else {
pageProtect(ptr, bytes, PAGE_EXECUTE_READ);
}
#else #else
pageProtect(ptr, bytes, PAGE_EXECUTE_READ); pageProtect(ptr, bytes, PAGE_EXECUTE_READ);
#endif #endif