<!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>[260440] 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/260440">260440</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2020-04-21 10:30:19 -0700 (Tue, 21 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[IPC hardening] ShareableResource::create() should validate its parameters
<https://webkit.org/b/210779>
<rdar://problem/60887693>

Reviewed by Chris Dumez.

* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::store):
* NetworkProcess/cache/NetworkCacheEntry.cpp:
(WebKit::NetworkCache::Entry::initializeShareableResourceHandleFromStorageRecord const):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::didFinishLoadForQuickLookDocumentInMainFrame):
- Handle nullptr returned from ShareableResource::create().

* Shared/ShareableResource.cpp:
(WebKit::ShareableResource::create):
- Change to return RefPtr<>.
- Validate parameters before calling constructor.  Return
  nullptr on failure.
(WebKit::ShareableResource::ShareableResource):
- Remove assert and comment since checks are now done in
  ShareableResource::create().
* Shared/ShareableResource.h:
(WebKit::ShareableResource::create):
- Change to return RefPtr<>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscacheNetworkCacheEntrycpp">trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedShareableResourcecpp">trunk/Source/WebKit/Shared/ShareableResource.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedShareableResourceh">trunk/Source/WebKit/Shared/ShareableResource.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (260439 => 260440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-04-21 17:28:37 UTC (rev 260439)
+++ trunk/Source/WebKit/ChangeLog       2020-04-21 17:30:19 UTC (rev 260440)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2020-04-21  David Kilzer  <ddkilzer@apple.com>
+
+        [IPC hardening] ShareableResource::create() should validate its parameters
+        <https://webkit.org/b/210779>
+        <rdar://problem/60887693>
+
+        Reviewed by Chris Dumez.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::store):
+        * NetworkProcess/cache/NetworkCacheEntry.cpp:
+        (WebKit::NetworkCache::Entry::initializeShareableResourceHandleFromStorageRecord const):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::didFinishLoadForQuickLookDocumentInMainFrame):
+        - Handle nullptr returned from ShareableResource::create().
+
+        * Shared/ShareableResource.cpp:
+        (WebKit::ShareableResource::create):
+        - Change to return RefPtr<>.
+        - Validate parameters before calling constructor.  Return
+          nullptr on failure.
+        (WebKit::ShareableResource::ShareableResource):
+        - Remove assert and comment since checks are now done in
+          ShareableResource::create().
+        * Shared/ShareableResource.h:
+        (WebKit::ShareableResource::create):
+        - Change to return RefPtr<>.
+
</ins><span class="cx"> 2020-04-21  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Tighten up some more IPC message checks in WebPasteboardProxy
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (260439 => 260440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp        2020-04-21 17:28:37 UTC (rev 260439)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp   2020-04-21 17:30:19 UTC (rev 260440)
</span><span class="lines">@@ -493,7 +493,11 @@
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx">         if (auto sharedMemory = bodyData.tryCreateSharedMemory()) {
</span><span class="cx">             mappedBody.shareableResource = ShareableResource::create(sharedMemory.releaseNonNull(), 0, bodyData.size());
</span><del>-            ASSERT(mappedBody.shareableResource);
</del><ins>+            if (!mappedBody.shareableResource) {
+                if (completionHandler)
+                    completionHandler(mappedBody);
+                return;
+            }
</ins><span class="cx">             mappedBody.shareableResource->createHandle(mappedBody.shareableResourceHandle);
</span><span class="cx">         }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscacheNetworkCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp (260439 => 260440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp   2020-04-21 17:28:37 UTC (rev 260439)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp      2020-04-21 17:30:19 UTC (rev 260440)
</span><span class="lines">@@ -176,6 +176,8 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     auto shareableResource = ShareableResource::create(sharedMemory.releaseNonNull(), 0, m_sourceStorageRecord.body.size());
</span><ins>+    if (!shareableResource)
+        return;
</ins><span class="cx">     shareableResource->createHandle(m_shareableResourceHandle);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitSharedShareableResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/ShareableResource.cpp (260439 => 260440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/ShareableResource.cpp 2020-04-21 17:28:37 UTC (rev 260439)
+++ trunk/Source/WebKit/Shared/ShareableResource.cpp    2020-04-21 17:30:19 UTC (rev 260440)
</span><span class="lines">@@ -106,8 +106,17 @@
</span><span class="cx">     return resource->wrapInSharedBuffer();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Ref<ShareableResource> ShareableResource::create(Ref<SharedMemory>&& sharedMemory, unsigned offset, unsigned size)
</del><ins>+RefPtr<ShareableResource> ShareableResource::create(Ref<SharedMemory>&& sharedMemory, unsigned offset, unsigned size)
</ins><span class="cx"> {
</span><ins>+    auto totalSize = CheckedSize(offset) + size;
+    if (totalSize.hasOverflowed()) {
+        LOG_ERROR("Failed to create ShareableResource from SharedMemory due to overflow.");
+        return nullptr;
+    }
+    if (totalSize.unsafeGet() > sharedMemory->size()) {
+        LOG_ERROR("Failed to create ShareableResource from SharedMemory due to mismatched buffer size.");
+        return nullptr;
+    }
</ins><span class="cx">     return adoptRef(*new ShareableResource(WTFMove(sharedMemory), offset, size));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -125,9 +134,6 @@
</span><span class="cx">     , m_offset(offset)
</span><span class="cx">     , m_size(size)
</span><span class="cx"> {
</span><del>-    ASSERT(m_offset + m_size <= m_sharedMemory->size());
-    
-    // FIXME (NetworkProcess): This data was received from another process.  If it is bogus, should we assume that process is compromised and we should kill it?
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ShareableResource::~ShareableResource()
</span></span></pre></div>
<a id="trunkSourceWebKitSharedShareableResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/ShareableResource.h (260439 => 260440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/ShareableResource.h   2020-04-21 17:28:37 UTC (rev 260439)
+++ trunk/Source/WebKit/Shared/ShareableResource.h      2020-04-21 17:30:19 UTC (rev 260440)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     // Create a shareable resource that uses malloced memory.
</span><del>-    static Ref<ShareableResource> create(Ref<SharedMemory>&&, unsigned offset, unsigned size);
</del><ins>+    static RefPtr<ShareableResource> create(Ref<SharedMemory>&&, unsigned offset, unsigned size);
</ins><span class="cx"> 
</span><span class="cx">     // Create a shareable resource from a handle.
</span><span class="cx">     static RefPtr<ShareableResource> map(const Handle&);
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (260439 => 260440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2020-04-21 17:28:37 UTC (rev 260439)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm    2020-04-21 17:30:19 UTC (rev 260440)
</span><span class="lines">@@ -4378,7 +4378,7 @@
</span><span class="cx"> 
</span><span class="cx">     ShareableResource::Handle handle;
</span><span class="cx">     auto shareableResource = ShareableResource::create(sharedMemory.releaseNonNull(), 0, buffer.size());
</span><del>-    if (!shareableResource->createHandle(handle))
</del><ins>+    if (!shareableResource || !shareableResource->createHandle(handle))
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     send(Messages::WebPageProxy::DidFinishLoadForQuickLookDocumentInMainFrame(handle));
</span></span></pre>
</div>
</div>

</body>
</html>