<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[286398] branches/safari-612-branch/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/286398">286398</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-12-01 16:18:12 -0800 (Wed, 01 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/285865">r285865</a>. rdar://problem/75139294

    Do some hardening in IPC::createMessageDecoder()
    https://bugs.webkit.org/show_bug.cgi?id=233148
    <rdar://75139294>

    Reviewed by Darin Adler.

    Do more bound validation insde createMessageDecoder() to make sure we stay within
    the bounds of our ReceiveBuffer.

    Also, when the body is out of line, set `out_of_line.deallocate` to false since
    we are taking ownership of the memory and will vm_deallocate() it ourselves.
    Normally the sender (Connection::sendOutgoingMessage) sets that flag to false but
    it is better not to rely on the sender setting a particular flag.

    * Platform/IPC/cocoa/ConnectionCocoa.mm:
    (IPC::createMessageDecoder):
    (IPC::Connection::receiveSourceEventHandler):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285865 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceWebKitChangeLog">branches/safari-612-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebKitPlatformIPCcocoaConnectionCocoamm">branches/safari-612-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (286397 => 286398)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/ChangeLog       2021-12-02 00:18:08 UTC (rev 286397)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog  2021-12-02 00:18:12 UTC (rev 286398)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2021-12-01  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r285865. rdar://problem/75139294
+
+    Do some hardening in IPC::createMessageDecoder()
+    https://bugs.webkit.org/show_bug.cgi?id=233148
+    <rdar://75139294>
+    
+    Reviewed by Darin Adler.
+    
+    Do more bound validation insde createMessageDecoder() to make sure we stay within
+    the bounds of our ReceiveBuffer.
+    
+    Also, when the body is out of line, set `out_of_line.deallocate` to false since
+    we are taking ownership of the memory and will vm_deallocate() it ourselves.
+    Normally the sender (Connection::sendOutgoingMessage) sets that flag to false but
+    it is better not to rely on the sender setting a particular flag.
+    
+    * Platform/IPC/cocoa/ConnectionCocoa.mm:
+    (IPC::createMessageDecoder):
+    (IPC::Connection::receiveSourceEventHandler):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285865 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-16  Chris Dumez  <cdumez@apple.com>
+
+            Do some hardening in IPC::createMessageDecoder()
+            https://bugs.webkit.org/show_bug.cgi?id=233148
+            <rdar://75139294>
+
+            Reviewed by Darin Adler.
+
+            Do more bound validation insde createMessageDecoder() to make sure we stay within
+            the bounds of our ReceiveBuffer.
+
+            Also, when the body is out of line, set `out_of_line.deallocate` to false since
+            we are taking ownership of the memory and will vm_deallocate() it ourselves.
+            Normally the sender (Connection::sendOutgoingMessage) sets that flag to false but
+            it is better not to rely on the sender setting a particular flag.
+
+            * Platform/IPC/cocoa/ConnectionCocoa.mm:
+            (IPC::createMessageDecoder):
+            (IPC::Connection::receiveSourceEventHandler):
+
+2021-12-01  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r285720. rdar://problem/83941760
</span><span class="cx"> 
</span><span class="cx">     WebKit is unable to recover if a WebProcess gets terminated while it is launching
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitPlatformIPCcocoaConnectionCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm (286397 => 286398)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm   2021-12-02 00:18:08 UTC (rev 286397)
+++ branches/safari-612-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm      2021-12-02 00:18:12 UTC (rev 286398)
</span><span class="lines">@@ -411,8 +411,14 @@
</span><span class="cx">     sendOutgoingMessages();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static std::unique_ptr<Decoder> createMessageDecoder(mach_msg_header_t* header)
</del><ins>+static std::unique_ptr<Decoder> createMessageDecoder(mach_msg_header_t* header, size_t bufferSize)
</ins><span class="cx"> {
</span><ins>+    if (UNLIKELY(header->msgh_size > bufferSize)) {
+        RELEASE_LOG_FAULT(IPC, "createMessageDecoder: msgh_size is greater than bufferSize (header->msgh_size: %lu, bufferSize: %lu)", static_cast<unsigned long>(header->msgh_size), bufferSize);
+        ASSERT_NOT_REACHED();
+        return nullptr;
+    }
+
</ins><span class="cx">     if (!(header->msgh_bits & MACH_MSGH_BITS_COMPLEX)) {
</span><span class="cx">         // We have a simple message.
</span><span class="cx">         uint8_t* body = reinterpret_cast<uint8_t*>(header + 1);
</span><span class="lines">@@ -429,9 +435,16 @@
</span><span class="cx">     mach_msg_body_t* body = reinterpret_cast<mach_msg_body_t*>(header + 1);
</span><span class="cx">     mach_msg_size_t numberOfPortDescriptors = body->msgh_descriptor_count;
</span><span class="cx">     ASSERT(numberOfPortDescriptors);
</span><del>-    if (!numberOfPortDescriptors)
</del><ins>+    if (UNLIKELY(!numberOfPortDescriptors))
</ins><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><ins>+    auto sizeWithPortDescriptors = CheckedSize { sizeof(mach_msg_header_t) + sizeof(mach_msg_body_t) } + CheckedSize { numberOfPortDescriptors } * sizeof(mach_msg_port_descriptor_t);
+    if (UNLIKELY(sizeWithPortDescriptors.hasOverflowed() || sizeWithPortDescriptors.value() > bufferSize)) {
+        RELEASE_LOG_FAULT(IPC, "createMessageDecoder: Overflow when computing sizeWithPortDescriptors (numberOfPortDescriptors: %lu)", static_cast<unsigned long>(numberOfPortDescriptors));
+        ASSERT_NOT_REACHED();
+        return nullptr;
+    }
+
</ins><span class="cx">     uint8_t* descriptorData = reinterpret_cast<uint8_t*>(body + 1);
</span><span class="cx"> 
</span><span class="cx">     // If the message body was sent out-of-line, don't treat the last descriptor
</span><span class="lines">@@ -448,7 +461,7 @@
</span><span class="cx">         if (descriptor->type.type != MACH_MSG_PORT_DESCRIPTOR)
</span><span class="cx">             return nullptr;
</span><span class="cx"> 
</span><del>-        attachments[numberOfAttachments - i - 1] = Attachment(descriptor->port.name, descriptor->port.disposition);
</del><ins>+        attachments[numberOfAttachments - i - 1] = Attachment { descriptor->port.name, descriptor->port.disposition };
</ins><span class="cx">         descriptorData += sizeof(mach_msg_port_descriptor_t);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -460,6 +473,7 @@
</span><span class="cx"> 
</span><span class="cx">         uint8_t* messageBody = static_cast<uint8_t*>(descriptor->out_of_line.address);
</span><span class="cx">         size_t messageBodySize = descriptor->out_of_line.size;
</span><ins>+        descriptor->out_of_line.deallocate = false; // We are taking ownership of the memory.
</ins><span class="cx"> 
</span><span class="cx">         return Decoder::create(messageBody, messageBodySize, [](const uint8_t* buffer, size_t length) {
</span><span class="cx">             // FIXME: <rdar://problem/62086358> bufferDeallocator block ignores mach_msg_ool_descriptor_t->deallocate
</span><span class="lines">@@ -468,10 +482,10 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     uint8_t* messageBody = descriptorData;
</span><del>-    ASSERT(descriptorData >= reinterpret_cast<uint8_t*>(header));
-    auto messageBodySize = CheckedSize { header->msgh_size } - static_cast<size_t>(descriptorData - reinterpret_cast<uint8_t*>(header));
</del><ins>+    ASSERT((reinterpret_cast<uint8_t*>(header) + sizeWithPortDescriptors.value()) == messageBody);
+    auto messageBodySize = header->msgh_size - sizeWithPortDescriptors;
</ins><span class="cx">     if (UNLIKELY(messageBodySize.hasOverflowed())) {
</span><del>-        RELEASE_LOG_FAULT(IPC, "createMessageDecoder: Overflow when computing bodySize (header->msgh_size: %lu, (descriptorData - reinterpret_cast<uint8_t*>(header)): %lu)", static_cast<unsigned long>(header->msgh_size), static_cast<unsigned long>(descriptorData - reinterpret_cast<uint8_t*>(header)));
</del><ins>+        RELEASE_LOG_FAULT(IPC, "createMessageDecoder: Overflow when computing bodySize (header->msgh_size: %lu, sizeWithPortDescriptors: %lu)", static_cast<unsigned long>(header->msgh_size), static_cast<unsigned long>(sizeWithPortDescriptors.value()));
</ins><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="lines">@@ -540,7 +554,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    std::unique_ptr<Decoder> decoder = createMessageDecoder(header);
</del><ins>+    std::unique_ptr<Decoder> decoder = createMessageDecoder(header, buffer.size());
</ins><span class="cx">     if (!decoder)
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>