<!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>[280837] releases/WebKitGTK/webkit-2.32/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/280837">280837</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2021-08-10 02:31:51 -0700 (Tue, 10 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/274158">r274158</a> - [IPC Hardening] SandboxExtension::HandleArray IPC decoder should not call Vector::resize()
https://bugs.webkit.org/show_bug.cgi?id=222977
<rdar://problem/75218451>

Reviewed by Anders Carlsson.

SandboxExtension::HandleArray IPC decoder should not call Vector::resize() with an untrusted size
coming from IPC. Instead, call Vector::append(), like the Vector IPC decoder does.

* Shared/Cocoa/SandboxExtensionCocoa.mm:
(WebKit::SandboxExtension::HandleArray::append):
(WebKit::SandboxExtension::HandleArray::decode):
* Shared/SandboxExtension.h:
(WebKit::SandboxExtension::append):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232SourceWebKitChangeLog">releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebKitSharedCocoaSandboxExtensionCocoamm">releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebKitSharedSandboxExtensionh">releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/SandboxExtension.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit232SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (280836 => 280837)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog   2021-08-10 09:29:58 UTC (rev 280836)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog      2021-08-10 09:31:51 UTC (rev 280837)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2021-03-09  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        [IPC Hardening] SandboxExtension::HandleArray IPC decoder should not call Vector::resize()
+        https://bugs.webkit.org/show_bug.cgi?id=222977
+        <rdar://problem/75218451>
+
+        Reviewed by Anders Carlsson.
+
+        SandboxExtension::HandleArray IPC decoder should not call Vector::resize() with an untrusted size
+        coming from IPC. Instead, call Vector::append(), like the Vector IPC decoder does.
+
+        * Shared/Cocoa/SandboxExtensionCocoa.mm:
+        (WebKit::SandboxExtension::HandleArray::append):
+        (WebKit::SandboxExtension::HandleArray::decode):
+        * Shared/SandboxExtension.h:
+        (WebKit::SandboxExtension::append):
+
+2021-03-09  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         [IPC Hardening] Protect WebPageProxy::willSubmitForm() against bad Strings
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=222955
</span><span class="cx">         <rdar://problem/75195062>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebKitSharedCocoaSandboxExtensionCocoamm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm (280836 => 280837)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm       2021-08-10 09:29:58 UTC (rev 280836)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm  2021-08-10 09:31:51 UTC (rev 280837)
</span><span class="lines">@@ -187,6 +187,11 @@
</span><span class="cx">     m_data.resize(size);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void SandboxExtension::HandleArray::append(Handle&& handle)
+{
+    m_data.append(WTFMove(handle));
+}
+
</ins><span class="cx"> SandboxExtension::Handle& SandboxExtension::HandleArray::operator[](size_t i)
</span><span class="cx"> {
</span><span class="cx">     RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(i < m_data.size());
</span><span class="lines">@@ -217,14 +222,14 @@
</span><span class="cx">     decoder >> size;
</span><span class="cx">     if (!size)
</span><span class="cx">         return WTF::nullopt;
</span><ins>+
</ins><span class="cx">     SandboxExtension::HandleArray handles;
</span><del>-    handles.allocate(*size);
</del><span class="cx">     for (size_t i = 0; i < *size; ++i) {
</span><span class="cx">         Optional<SandboxExtension::Handle> handle;
</span><span class="cx">         decoder >> handle;
</span><span class="cx">         if (!handle)
</span><span class="cx">             return WTF::nullopt;
</span><del>-        handles[i] = WTFMove(*handle);
</del><ins>+        handles.append(WTFMove(*handle));
</ins><span class="cx">     }
</span><span class="cx">     return WTFMove(handles);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebKitSharedSandboxExtensionh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/SandboxExtension.h (280836 => 280837)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/SandboxExtension.h   2021-08-10 09:29:58 UTC (rev 280836)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/Shared/SandboxExtension.h      2021-08-10 09:31:51 UTC (rev 280837)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">         HandleArray& operator=(HandleArray&&) = default;
</span><span class="cx">         ~HandleArray();
</span><span class="cx">         void allocate(size_t);
</span><ins>+        void append(Handle&&);
</ins><span class="cx">         Handle& operator[](size_t i);
</span><span class="cx">         Handle& at(size_t i) { return operator[](i); }
</span><span class="cx">         const Handle& operator[](size_t i) const;
</span><span class="lines">@@ -149,6 +150,7 @@
</span><span class="cx"> inline SandboxExtension::HandleArray::HandleArray() { }
</span><span class="cx"> inline SandboxExtension::HandleArray::~HandleArray() { }
</span><span class="cx"> inline void SandboxExtension::HandleArray::allocate(size_t) { }
</span><ins>+inline void SandboxExtension::HandleArray::append(Handle&&) { }
</ins><span class="cx"> inline size_t SandboxExtension::HandleArray::size() const { return 0; }    
</span><span class="cx"> inline const SandboxExtension::Handle& SandboxExtension::HandleArray::operator[](size_t) const { return m_emptyHandle; }
</span><span class="cx"> inline SandboxExtension::Handle& SandboxExtension::HandleArray::operator[](size_t) { return m_emptyHandle; }
</span></span></pre>
</div>
</div>

</body>
</html>