<!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>[245622] trunk</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/245622">245622</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2019-05-22 10:21:19 -0700 (Wed, 22 May 2019)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] ArrayBufferContents::tryAllocate signs the pointer with allocation size and authenticates it with sizeInBytes
https://bugs.webkit.org/show_bug.cgi?id=198101
Reviewed by Michael Saboff.
JSTests:
* stress/zero-sized-array-buffer-pointer-should-be-signed-with-zero.js: Added.
(shouldBe):
Source/JavaScriptCore:
When we allocate 0-length ArrayBuffer, we allocate 1 byte storage instead because we would like to ensure that
non-neutered ArrayBuffer always have non nullptr. While we allocate a 1 byte storage, this ArrayBuffer says
sizeInBytes = 0. However, we accidentally configure the vector pointer with this 1 byte size in the constructor.
In ARM64E device, we sign the vector pointer with modifier = 1 (1 byte size), and later we authenticate this
pointer with modifier = 0 (sizeInBytes), and fail to authenticate the pointer.
In this patch, we sign the pointer with sizeInBytes so that we correctly authenticate the 0 bytes vector pointer.
* runtime/ArrayBuffer.cpp:
(JSC::ArrayBufferContents::tryAllocate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayBuffercpp">trunk/Source/JavaScriptCore/runtime/ArrayBuffer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstresszerosizedarraybufferpointershouldbesignedwithzerojs">trunk/JSTests/stress/zero-sized-array-buffer-pointer-should-be-signed-with-zero.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (245621 => 245622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2019-05-22 17:18:21 UTC (rev 245621)
+++ trunk/JSTests/ChangeLog 2019-05-22 17:21:19 UTC (rev 245622)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-05-22 Yusuke Suzuki <ysuzuki@apple.com>
+
+ [JSC] ArrayBufferContents::tryAllocate signs the pointer with allocation size and authenticates it with sizeInBytes
+ https://bugs.webkit.org/show_bug.cgi?id=198101
+
+ Reviewed by Michael Saboff.
+
+ * stress/zero-sized-array-buffer-pointer-should-be-signed-with-zero.js: Added.
+ (shouldBe):
+
</ins><span class="cx"> 2019-05-20 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup Yarr regexp code around paren contexts.
</span></span></pre></div>
<a id="trunkJSTestsstresszerosizedarraybufferpointershouldbesignedwithzerojs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/zero-sized-array-buffer-pointer-should-be-signed-with-zero.js (0 => 245622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/zero-sized-array-buffer-pointer-should-be-signed-with-zero.js (rev 0)
+++ trunk/JSTests/stress/zero-sized-array-buffer-pointer-should-be-signed-with-zero.js 2019-05-22 17:21:19 UTC (rev 245622)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+function shouldBe(actual, expected) {
+ if (actual !== expected)
+ throw new Error('bad value: ' + actual);
+}
+
+var typedArray = new Int8Array();
+shouldBe(typedArray.length, 0);
+var subarray = typedArray.subarray(0, 0);
+shouldBe(subarray.length, 0);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (245621 => 245622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2019-05-22 17:18:21 UTC (rev 245621)
+++ trunk/Source/JavaScriptCore/ChangeLog 2019-05-22 17:21:19 UTC (rev 245622)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2019-05-22 Yusuke Suzuki <ysuzuki@apple.com>
+
+ [JSC] ArrayBufferContents::tryAllocate signs the pointer with allocation size and authenticates it with sizeInBytes
+ https://bugs.webkit.org/show_bug.cgi?id=198101
+
+ Reviewed by Michael Saboff.
+
+ When we allocate 0-length ArrayBuffer, we allocate 1 byte storage instead because we would like to ensure that
+ non-neutered ArrayBuffer always have non nullptr. While we allocate a 1 byte storage, this ArrayBuffer says
+ sizeInBytes = 0. However, we accidentally configure the vector pointer with this 1 byte size in the constructor.
+ In ARM64E device, we sign the vector pointer with modifier = 1 (1 byte size), and later we authenticate this
+ pointer with modifier = 0 (sizeInBytes), and fail to authenticate the pointer.
+
+ In this patch, we sign the pointer with sizeInBytes so that we correctly authenticate the 0 bytes vector pointer.
+
+ * runtime/ArrayBuffer.cpp:
+ (JSC::ArrayBufferContents::tryAllocate):
+
</ins><span class="cx"> 2019-05-21 Ross Kirsling <ross.kirsling@sony.com>
</span><span class="cx">
</span><span class="cx"> [PlayStation] Don't call fcntl.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayBuffer.cpp (245621 => 245622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayBuffer.cpp 2019-05-22 17:18:21 UTC (rev 245621)
+++ trunk/Source/JavaScriptCore/runtime/ArrayBuffer.cpp 2019-05-22 17:21:19 UTC (rev 245622)
</span><span class="lines">@@ -106,12 +106,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- size_t size = static_cast<size_t>(numElements) * static_cast<size_t>(elementByteSize);
- if (!size)
- size = 1; // Make sure malloc actually allocates something, but not too much. We use null to mean that the buffer is neutered.
</del><ins>+ size_t sizeInBytes = static_cast<size_t>(numElements) * static_cast<size_t>(elementByteSize);
+ size_t allocationSize = sizeInBytes;
+ if (!allocationSize)
+ allocationSize = 1; // Make sure malloc actually allocates something, but not too much. We use null to mean that the buffer is neutered.
</ins><span class="cx">
</span><del>- void* data = Gigacage::tryMalloc(Gigacage::Primitive, numElements * elementByteSize);
- m_data = DataType(data, size);
</del><ins>+ void* data = Gigacage::tryMalloc(Gigacage::Primitive, allocationSize);
+ m_data = DataType(data, sizeInBytes);
</ins><span class="cx"> if (!data) {
</span><span class="cx"> reset();
</span><span class="cx"> return;
</span><span class="lines">@@ -118,9 +119,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (policy == ZeroInitialize)
</span><del>- memset(data, 0, size);
</del><ins>+ memset(data, 0, allocationSize);
</ins><span class="cx">
</span><del>- m_sizeInBytes = numElements * elementByteSize;
</del><ins>+ m_sizeInBytes = sizeInBytes;
</ins><span class="cx"> RELEASE_ASSERT(m_sizeInBytes <= MAX_ARRAY_BUFFER_SIZE);
</span><span class="cx"> m_destructor = [] (void* p) { Gigacage::free(Gigacage::Primitive, p); };
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>