<!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>[211216] branches/safari-603-branch/Source/JavaScriptCore</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/211216">211216</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-26 08:38:49 -0800 (Thu, 26 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/234555">r234555</a> via <a href="http://trac.webkit.org/projects/webkit/changeset/211180">r211180</a>. rdar://problem/30156092</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeInferredTypeTablecpp">branches/safari-603-branch/Source/JavaScriptCore/runtime/InferredTypeTable.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (211215 => 211216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-26 16:32:21 UTC (rev 211215)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-26 16:38:49 UTC (rev 211216)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-01-26 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211180. rdar://problem/30156092
+
+ 2017-01-25 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211124. rdar://problem/30156092
+
+ 2017-01-24 Michael Saboff <msaboff@apple.com>
+
+ InferredTypeTable entry manipulation is not TOCTOU race safe
+ https://bugs.webkit.org/show_bug.cgi?id=167344
+
+ Reviewed by Filip Pizlo.
+
+ Made the accesses to table values safe from Time of Check,
+ Time of Use races with local temporary values.
+
+ Fixed point that we set an entry in the table to access the
+ current table entry instead of using the local entry. In that case,
+ we reload the now changed entry.
+
+ * runtime/InferredTypeTable.cpp:
+ (JSC::InferredTypeTable::visitChildren):
+ (JSC::InferredTypeTable::get):
+ (JSC::InferredTypeTable::willStoreValue):
+ (JSC::InferredTypeTable::makeTop):
+
</ins><span class="cx"> 2017-01-25 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r211180.
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeInferredTypeTablecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/InferredTypeTable.cpp (211215 => 211216)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/InferredTypeTable.cpp 2017-01-26 16:32:21 UTC (rev 211215)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/InferredTypeTable.cpp 2017-01-26 16:38:49 UTC (rev 211216)
</span><span class="lines">@@ -57,10 +57,12 @@
</span><span class="cx"> ConcurrentJSLocker locker(inferredTypeTable->m_lock);
</span><span class="cx">
</span><span class="cx"> for (auto& entry : inferredTypeTable->m_table) {
</span><del>- if (!entry.value)
</del><ins>+ auto entryValue = entry.value;
+
+ if (!entryValue)
</ins><span class="cx"> continue;
</span><del>- if (entry.value->isRelevant())
- visitor.append(entry.value);
</del><ins>+ if (entryValue->isRelevant())
+ visitor.append(entryValue);
</ins><span class="cx"> else
</span><span class="cx"> entry.value.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -69,16 +71,20 @@
</span><span class="cx"> InferredType* InferredTypeTable::get(const ConcurrentJSLocker&, UniquedStringImpl* uid)
</span><span class="cx"> {
</span><span class="cx"> auto iter = m_table.find(uid);
</span><del>- if (iter == m_table.end() || !iter->value)
</del><ins>+ if (iter == m_table.end())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ InferredType* entryValue = iter->value.get();
+ if (!entryValue)
+ return nullptr;
+
</ins><span class="cx"> // Take this opportunity to prune invalidated types.
</span><del>- if (!iter->value->isRelevant()) {
</del><ins>+ if (!entryValue->isRelevant()) {
</ins><span class="cx"> iter->value.clear();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return iter->value.get();
</del><ins>+ return entryValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InferredType* InferredTypeTable::get(UniquedStringImpl* uid)
</span><span class="lines">@@ -99,10 +105,14 @@
</span><span class="cx">
</span><span class="cx"> if (age == OldProperty) {
</span><span class="cx"> TableType::iterator iter = m_table.find(propertyName.uid());
</span><del>- if (iter == m_table.end() || !iter->value)
</del><ins>+ if (iter == m_table.end())
</ins><span class="cx"> return false; // Absence on replace => top.
</span><ins>+
+ InferredType* entryValue = iter->value.get();
+ if (!entryValue)
+ return false;
</ins><span class="cx">
</span><del>- if (iter->value->willStoreValue(vm, propertyName, value))
</del><ins>+ if (entryValue->willStoreValue(vm, propertyName, value))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> iter->value.clear();
</span><span class="lines">@@ -114,14 +124,17 @@
</span><span class="cx"> ConcurrentJSLocker locker(m_lock);
</span><span class="cx"> result = m_table.add(propertyName.uid(), WriteBarrier<InferredType>());
</span><span class="cx"> }
</span><ins>+ InferredType* entryValue = result.iterator->value.get();
+
</ins><span class="cx"> if (result.isNewEntry) {
</span><span class="cx"> InferredType* inferredType = InferredType::create(vm);
</span><span class="cx"> WTF::storeStoreFence();
</span><span class="cx"> result.iterator->value.set(vm, this, inferredType);
</span><del>- } else if (!result.iterator->value)
</del><ins>+ entryValue = inferredType;
+ } else if (!entryValue)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (result.iterator->value->willStoreValue(vm, propertyName, value))
</del><ins>+ if (entryValue->willStoreValue(vm, propertyName, value))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> result.iterator->value.clear();
</span><span class="lines">@@ -133,10 +146,15 @@
</span><span class="cx"> // The algorithm here relies on the fact that only one thread modifies the hash map.
</span><span class="cx"> if (age == OldProperty) {
</span><span class="cx"> TableType::iterator iter = m_table.find(propertyName.uid());
</span><del>- if (iter == m_table.end() || !iter->value)
</del><ins>+ if (iter == m_table.end())
</ins><span class="cx"> return; // Absence on replace => top.
</span><span class="cx">
</span><del>- iter->value->makeTop(vm, propertyName);
</del><ins>+ InferredType* entryValue = iter->value.get();
+
+ if (!entryValue)
+ return;
+
+ entryValue->makeTop(vm, propertyName);
</ins><span class="cx"> iter->value.clear();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>