Changeset 261598 in webkit

Timestamp:

May 12, 2020, 9:35:02 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

catch_mach_exception_raise_state() should fail early if the faulting address is not of interest.
​https://bugs.webkit.org/show_bug.cgi?id=211799
<rdar://problem/62939204>

Reviewed by Saam Barati.

• wtf/threads/Signals.cpp:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/threads/Signals.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-05-12  Mark Lam  <mark.lam@apple.com>
+
+        catch_mach_exception_raise_state() should fail early if the faulting address is not of interest.
+        https://bugs.webkit.org/show_bug.cgi?id=211799
+        <rdar://problem/62939204>
+
+        Reviewed by Saam Barati.
+
+        * wtf/threads/Signals.cpp:
+
 2020-05-12  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WTF/wtf/threads/Signals.cpp

@@ -205 +205 @@
         ASSERT_UNUSED(dataCount, dataCount == 2);
         info.faultingAddress = reinterpret_cast<void*>(exceptionData[1]);
+#if CPU(ADDRESS64)
+        // If the faulting address is out of the range of any valid memory, we would
+        // not have any reason to handle it. Just let the default handler take care of it.
+        static constexpr unsigned validAddressBits = OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
+        static constexpr uintptr_t invalidAddressMask = ~((1ull << validAddressBits) - 1);
+        if (bitwise_cast<uintptr_t>(info.faultingAddress) & invalidAddressMask)
+            return KERN_FAILURE;
+#endif
     }