Attachment 361153 Details for Bug 194270 – Patch

[patch] Patch

bug-194270-20190204194119.patch (text/plain), 2.29 KB, created by Keith Miller on 2019-02-04 19:41:21 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Miller

Created: 2019-02-04 19:41:21 PST

Size: 2.29 KB

patch

obsolete

>Subversion Revision: 240959
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 4d70226ac5b3db1084dff51990d64fae9d9b21b9..fe3148029d17363b9278544901e473974a7f2bc1 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-02-04  Keith Miller  <keith_miller@apple.com>
>+
>+        JITExecutable should not try to mmap executable memory without entitlement
>+        https://bugs.webkit.org/show_bug.cgi?id=194270
>+        <rdar://problem/47717151>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We try to use our one time token to map JIT memory if we are not
>+        going to use the JIT in a process. If we never had the
>+        entitlement, however, this would cause the process to crash.  This
>+        patch fixes that.
>+
>+        * jit/ExecutableAllocator.cpp:
>+        (JSC::isJITEnabled):
>+        (JSC::ExecutableAllocator::setJITEnabled):
>+
> 2019-02-04  Robin Morisset  <rmorisset@apple.com>
> 
>         when lowering AssertNotEmpty, create the value before creating the patchpoint
>diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
>index 4606756e80c4b8f6f08c48aa5c769d5c8982628c..4981242ad738dcdaa887d9e030d645933a28d77e 100644
>--- a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
>+++ b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
>@@ -117,11 +117,12 @@ class FixedVMPoolExecutableAllocator;
> static FixedVMPoolExecutableAllocator* allocator = nullptr;
> static ExecutableAllocator* executableAllocator = nullptr;
> 
>+static const char* jitEntitlement = "dynamic-codesigning";
> static bool s_isJITEnabled = true;
> static bool isJITEnabled()
> {
> #if PLATFORM(IOS_FAMILY) && (CPU(ARM64) || CPU(ARM))
>-    return processHasEntitlement("dynamic-codesigning") && s_isJITEnabled;
>+    return processHasEntitlement(jitEntitlement) && s_isJITEnabled;
> #else
>     return s_isJITEnabled;
> #endif
>@@ -137,6 +138,9 @@ void ExecutableAllocator::setJITEnabled(bool enabled)
> 
> #if PLATFORM(IOS_FAMILY) && (CPU(ARM64) || CPU(ARM))
>     if (!enabled) {
>+        if (!processHasEntitlement(jitEntitlement))
>+            return;
>+
>         constexpr size_t size = 1;
>         constexpr int protection = PROT_READ | PROT_WRITE | PROT_EXEC;
>         constexpr int flags = MAP_PRIVATE | MAP_ANON | MAP_JIT;

Flags:

saam: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 194270: 361152 | 361153