<!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>[265638] trunk/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/265638">265638</a></dd>
<dt>Author</dt> <dd>katherine_cheney@apple.com</dd>
<dt>Date</dt> <dd>2020-08-13 17:02:07 -0700 (Thu, 13 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Create SharedMemory::IPCHandle object to validate the size of SharedMemory::Handle objects sent over IPC
https://bugs.webkit.org/show_bug.cgi?id=215288
<rdar://problem/60870795>

Reviewed by David Kilzer.

Part 1 of a multi-patch plan to convert all SharedMemory::Handle
objects being sent over IPC to use SharedMemory::IPCHandle objects instead.

* Platform/SharedMemory.h:
(WebKit::SharedMemory::IPCHandle::IPCHandle):
* Platform/cocoa/SharedMemoryCocoa.cpp:
(WebKit::SharedMemory::IPCHandle::encode const):
(WebKit::SharedMemory::IPCHandle::decode):
Validate the size of the data sent in the IPCHandle::decode()
function.
* Platform/unix/SharedMemoryUnix.cpp:
(WebKit::SharedMemory::IPCHandle::encode const):
(WebKit::SharedMemory::IPCHandle::decode):
* Platform/win/SharedMemoryWin.cpp:
Implement IPCHandle encode and decode for all platforms for when we remove
SharedMemory::Handle encode/decode functions.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformSharedMemoryh">trunk/Source/WebKit/Platform/SharedMemory.h</a></li>
<li><a href="#trunkSourceWebKitPlatformcocoaSharedMemoryCocoacpp">trunk/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp</a></li>
<li><a href="#trunkSourceWebKitPlatformunixSharedMemoryUnixcpp">trunk/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp</a></li>
<li><a href="#trunkSourceWebKitPlatformwinSharedMemoryWincpp">trunk/Source/WebKit/Platform/win/SharedMemoryWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (265637 => 265638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-08-13 23:29:02 UTC (rev 265637)
+++ trunk/Source/WebKit/ChangeLog       2020-08-14 00:02:07 UTC (rev 265638)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2020-08-13  Kate Cheney  <katherine_cheney@apple.com>
+
+        Create SharedMemory::IPCHandle object to validate the size of SharedMemory::Handle objects sent over IPC
+        https://bugs.webkit.org/show_bug.cgi?id=215288
+        <rdar://problem/60870795>
+
+        Reviewed by David Kilzer.
+
+        Part 1 of a multi-patch plan to convert all SharedMemory::Handle
+        objects being sent over IPC to use SharedMemory::IPCHandle objects instead.
+
+        * Platform/SharedMemory.h:
+        (WebKit::SharedMemory::IPCHandle::IPCHandle):
+        * Platform/cocoa/SharedMemoryCocoa.cpp:
+        (WebKit::SharedMemory::IPCHandle::encode const):
+        (WebKit::SharedMemory::IPCHandle::decode):
+        Validate the size of the data sent in the IPCHandle::decode()
+        function.
+        * Platform/unix/SharedMemoryUnix.cpp:
+        (WebKit::SharedMemory::IPCHandle::encode const):
+        (WebKit::SharedMemory::IPCHandle::decode):
+        * Platform/win/SharedMemoryWin.cpp:
+        Implement IPCHandle encode and decode for all platforms for when we remove
+        SharedMemory::Handle encode/decode functions.
+
</ins><span class="cx"> 2020-08-13  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed non-unified build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformSharedMemoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/SharedMemory.h (265637 => 265638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/SharedMemory.h      2020-08-13 23:29:02 UTC (rev 265637)
+++ trunk/Source/WebKit/Platform/SharedMemory.h 2020-08-14 00:02:07 UTC (rev 265638)
</span><span class="lines">@@ -103,6 +103,20 @@
</span><span class="cx"> #endif
</span><span class="cx">     };
</span><span class="cx"> 
</span><ins>+    struct IPCHandle {
+        IPCHandle() = default;
+        IPCHandle(Handle&& handle, uint64_t dataSize)
+            : handle(WTFMove(handle))
+            , dataSize(dataSize)
+        {
+        }
+        void encode(IPC::Encoder&) const;
+        static WARN_UNUSED_RETURN bool decode(IPC::Decoder&, IPCHandle&);
+
+        Handle handle;
+        uint64_t dataSize { 0 };
+    };
+
</ins><span class="cx">     static RefPtr<SharedMemory> allocate(size_t);
</span><span class="cx">     static RefPtr<SharedMemory> create(void*, size_t, Protection);
</span><span class="cx">     static RefPtr<SharedMemory> copyBuffer(const WebCore::SharedBuffer&);
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformcocoaSharedMemoryCocoacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp (265637 => 265638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp 2020-08-13 23:29:02 UTC (rev 265637)
+++ trunk/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp    2020-08-14 00:02:07 UTC (rev 265638)
</span><span class="lines">@@ -113,6 +113,44 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void SharedMemory::IPCHandle::encode(IPC::Encoder& encoder) const
+{
+    encoder << static_cast<uint64_t>(handle.m_size);
+    encoder << dataSize;
+    encoder << IPC::MachPort(handle.m_port, MACH_MSG_TYPE_MOVE_SEND);
+    handle.m_port = MACH_PORT_NULL;
+}
+
+bool SharedMemory::IPCHandle::decode(IPC::Decoder& decoder, IPCHandle& ipcHandle)
+{
+    ASSERT(!ipcHandle.handle.m_port);
+    ASSERT(!ipcHandle.handle.m_size);
+
+    SharedMemory::Handle handle;
+
+    uint64_t bufferSize;
+    if (!decoder.decode(bufferSize))
+        return false;
+
+    uint64_t dataLength;
+    if (!decoder.decode(dataLength))
+        return false;
+
+    // SharedMemory::Handle::size() is rounded up to the nearest page.
+    if (dataLength > bufferSize)
+        return false;
+
+    IPC::MachPort machPort;
+    if (!decoder.decode(machPort))
+        return false;
+    
+    handle.m_size = bufferSize;
+    handle.m_port = machPort.port();
+    ipcHandle.handle = WTFMove(handle);
+    ipcHandle.dataSize = dataLength;
+    return true;
+}
+
</ins><span class="cx"> static inline void* toPointer(mach_vm_address_t address)
</span><span class="cx"> {
</span><span class="cx">     return reinterpret_cast<void*>(static_cast<uintptr_t>(address));
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformunixSharedMemoryUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp (265637 => 265638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp   2020-08-13 23:29:02 UTC (rev 265637)
+++ trunk/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp      2020-08-14 00:02:07 UTC (rev 265638)
</span><span class="lines">@@ -72,6 +72,22 @@
</span><span class="cx">     return m_attachment.fileDescriptor() == -1;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void SharedMemory::IPCHandle::encode(IPC::Encoder& encoder) const
+{
+    encoder << handle.releaseAttachment();
+}
+
+bool SharedMemory::IPCHandle::decode(IPC::Decoder& decoder, IPCHandle& ipcHandle)
+{
+    ASSERT_ARG(ipcHandle.handle, ipcHandle.handle.isNull());
+    IPC::Attachment attachment;
+    if (!decoder.decode(attachment))
+        return false;
+
+    ipcHandle.handle.adoptAttachment(WTFMove(attachment));
+    return true;
+}
+
</ins><span class="cx"> void SharedMemory::Handle::encode(IPC::Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx">     encoder << releaseAttachment();
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformwinSharedMemoryWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/win/SharedMemoryWin.cpp (265637 => 265638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/win/SharedMemoryWin.cpp     2020-08-13 23:29:02 UTC (rev 265637)
+++ trunk/Source/WebKit/Platform/win/SharedMemoryWin.cpp        2020-08-14 00:02:07 UTC (rev 265638)
</span><span class="lines">@@ -62,6 +62,47 @@
</span><span class="cx">     return !m_handle;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void SharedMemory::IPCHandle::encode(IPC::Encoder& encoder) const
+{
+    encoder << static_cast<uint64_t>(handle.m_size);
+    encoder << dataSize;
+    handle.encodeHandle(encoder, handle.m_handle);
+
+    // Hand off ownership of our HANDLE to the receiving process. It will close it for us.
+    // FIXME: If the receiving process crashes before it receives the memory, the memory will be
+    // leaked. See <http://webkit.org/b/47502>.
+    handle.m_handle = 0;
+}
+
+bool SharedMemory::IPCHandle::decode(IPC::Decoder& decoder, IPCHandle& ipcHandle)
+{
+    ASSERT_ARG(ipcHandle, !ipcHandle.handle.m_handle);
+    ASSERT_ARG(ipcHandle, !ipcHandle.handle.m_size);
+
+    SharedMemory::Handle handle;
+
+    uint64_t bufferSize;
+    if (!decoder.decode(bufferSize))
+        return false;
+
+    uint64_t dataLength;
+    if (!decoder.decode(dataLength))
+        return false;
+    
+    if (dataLength != bufferSize)
+        return false;
+    
+    auto processSpecificHandle = handle.decodeHandle(decoder);
+    if (!processSpecificHandle)
+        return false;
+
+    handle.m_handle = processSpecificHandle.value();
+    handle.m_size = bufferSize;
+    ipcHandle.handle = WTFMove(handle);
+    ipcHandle.dataSize = dataLength;
+    return true;
+}
+
</ins><span class="cx"> void SharedMemory::Handle::encode(IPC::Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx">     encoder << static_cast<uint64_t>(m_size);
</span></span></pre>
</div>
</div>

</body>
</html>