mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a less extreme entitlement for our run-time machine code generation

Browse Source 
See https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_disable-executable-page-protection
and https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_allow-jit

Change-Id: I192038efa9cff4fb723bf4bdc8644f0b09f0fcda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93181
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist
2020-04-29 20:12:21 +03:00
parent 639eab5d0b
commit 2c366aae92
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bridges/source/cpp_uno/shared/vtablefactory.cxx
View File

@@ -77,6 +77,11 @@ extern "C" void * allocExec(
std::size_t n = (*size + (pagesize - 1)) & ~(pagesize - 1); std::size_t n = (*size + (pagesize - 1)) & ~(pagesize - 1);
void * p; void * p;
#if defined SAL_UNX #if defined SAL_UNX
#if defined MACOSX
p = mmap(
nullptr, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON | MAP_JIT, -1,
0);
#else
p = mmap( p = mmap(
nullptr, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, nullptr, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1,
0); 0);
@@ -88,6 +93,7 @@ extern "C" void * allocExec(
munmap (p, n); munmap (p, n);
p = nullptr; p = nullptr;
} }
#endif
#elif defined _WIN32 #elif defined _WIN32
p = VirtualAlloc(nullptr, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE); p = VirtualAlloc(nullptr, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
#endif #endif

2
hardened_runtime.xcent.in
View File

@@ -6,7 +6,7 @@
<key>com.apple.security.automation.apple-events</key> <key>com.apple.security.automation.apple-events</key>
<true/> <true/>
<!-- Needed for our runtime machine code generation --> <!-- Needed for our runtime machine code generation -->
<key>com.apple.security.cs.disable-executable-page-protection</key> <key>com.apple.security.cs.allow-jit</key>
<true/> <true/>
<!-- allow use of third-party plugins/frameworks (aka Java) --> <!-- allow use of third-party plugins/frameworks (aka Java) -->
<key>com.apple.security.cs.disable-library-validation</key> <key>com.apple.security.cs.disable-library-validation</key>