<!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>[173178] 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/173178">173178</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-09-02 09:52:35 -0700 (Tue, 02 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Out of bounds write in vmEntryToJavaScript / JSC::JITCode::execute
https://bugs.webkit.org/show_bug.cgi?id=136305
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
While preparing the callee's CallFrame, ProtoCallFrame fixes any arity mismatch
and then JITCode::execute() calls the normal entrypoint. This is incompatible
with the expectation of FTL generated functions. Changed ProtoCallFrame to not
perform the arity fix, but just flag an arity mismatch. now JITCode::execute()
uses that arity mismatch condition to select the normal or arity check
entrypoint. The entrypoint selection is only done for functions, programs
and eval always have one parameter.
* interpreter/ProtoCallFrame.cpp:
(JSC::ProtoCallFrame::init): Changed to flag arity mismatch instead of fixing it.
* interpreter/ProtoCallFrame.h:
(JSC::ProtoCallFrame::needArityCheck): New boolean to signify what entrypoint
should be called.
* jit/JITCode.cpp:
(JSC::JITCode::execute): Select normal or arity check entrypoint as appropriate.
LayoutTests:
* js/arity-mismatch-at-vmentry-expected.txt: Added.
* js/arity-mismatch-at-vmentry.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterProtoCallFramecpp">trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterProtoCallFrameh">trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCodecpp">trunk/Source/JavaScriptCore/jit/JITCode.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsaritymismatchatvmentryexpectedtxt">trunk/LayoutTests/js/arity-mismatch-at-vmentry-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsaritymismatchatvmentryhtml">trunk/LayoutTests/js/arity-mismatch-at-vmentry.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173177 => 173178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-02 16:47:11 UTC (rev 173177)
+++ trunk/LayoutTests/ChangeLog 2014-09-02 16:52:35 UTC (rev 173178)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-02 Michael Saboff <msaboff@apple.com>
+
+ Out of bounds write in vmEntryToJavaScript / JSC::JITCode::execute
+ https://bugs.webkit.org/show_bug.cgi?id=136305
+
+ Reviewed by Filip Pizlo.
+
+ * js/arity-mismatch-at-vmentry-expected.txt: Added.
+ * js/arity-mismatch-at-vmentry.html: Added.
+
</ins><span class="cx"> 2014-09-02 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> CachedResourceLoader should check redirections to reuse or not cached resources
</span></span></pre></div>
<a id="trunkLayoutTestsjsaritymismatchatvmentryexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/arity-mismatch-at-vmentry-expected.txt (0 => 173178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/arity-mismatch-at-vmentry-expected.txt (rev 0)
+++ trunk/LayoutTests/js/arity-mismatch-at-vmentry-expected.txt 2014-09-02 16:52:35 UTC (rev 173178)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+This tests that vm entry to a JS function with arity mismatch doesn't crash (bug 136305).
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsaritymismatchatvmentryhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/arity-mismatch-at-vmentry.html (0 => 173178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/arity-mismatch-at-vmentry.html (rev 0)
+++ trunk/LayoutTests/js/arity-mismatch-at-vmentry.html 2014-09-02 16:52:35 UTC (rev 173178)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<span id="span">
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that vm entry to a JS function with arity mismatch doesn't crash (bug 136305).");
+
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ window.jsTestIsAsync = true;
+
+ function marsaglia(m_z, m_w, n) {
+ var result;
+ for (var i = 0; i < n; ++i) {
+ }
+ }
+
+ var result = 0;
+ for (var i = 0; i < 100; ++i)
+ result += marsaglia(i, i + 1, 1000000);
+
+ document.getElementById("span").addEventListener("readystatechange", marsaglia);
+
+ var dispatch_fn = function() {
+ evt = document.createEvent("Event");
+ evt.initEvent("readystatechange");
+ document.getElementById("span").dispatchEvent(evt);
+ }
+
+ window.setInterval(dispatch_fn, 0);
+ window.setTimeout('finishJSTest()', 1);
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173177 => 173178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-02 16:47:11 UTC (rev 173177)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-02 16:52:35 UTC (rev 173178)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-09-02 Michael Saboff <msaboff@apple.com>
+
+ Out of bounds write in vmEntryToJavaScript / JSC::JITCode::execute
+ https://bugs.webkit.org/show_bug.cgi?id=136305
+
+ Reviewed by Filip Pizlo.
+
+ While preparing the callee's CallFrame, ProtoCallFrame fixes any arity mismatch
+ and then JITCode::execute() calls the normal entrypoint. This is incompatible
+ with the expectation of FTL generated functions. Changed ProtoCallFrame to not
+ perform the arity fix, but just flag an arity mismatch. now JITCode::execute()
+ uses that arity mismatch condition to select the normal or arity check
+ entrypoint. The entrypoint selection is only done for functions, programs
+ and eval always have one parameter.
+
+ * interpreter/ProtoCallFrame.cpp:
+ (JSC::ProtoCallFrame::init): Changed to flag arity mismatch instead of fixing it.
+ * interpreter/ProtoCallFrame.h:
+ (JSC::ProtoCallFrame::needArityCheck): New boolean to signify what entrypoint
+ should be called.
+ * jit/JITCode.cpp:
+ (JSC::JITCode::execute): Select normal or arity check entrypoint as appropriate.
+
</ins><span class="cx"> 2014-09-02 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] testapi.exe is not built.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterProtoCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp (173177 => 173178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp 2014-09-02 16:47:11 UTC (rev 173177)
+++ trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp 2014-09-02 16:52:35 UTC (rev 173178)
</span><span class="lines">@@ -39,14 +39,13 @@
</span><span class="cx"> this->setScope(scope);
</span><span class="cx"> this->setCallee(callee);
</span><span class="cx"> this->setArgumentCountIncludingThis(argCountIncludingThis);
</span><del>- size_t paddedArgsCount = argCountIncludingThis;
- if (codeBlock) {
- size_t numParameters = codeBlock->numParameters();
- if (paddedArgsCount < numParameters)
- paddedArgsCount = numParameters;
- }
- // Round up paddedArgsCount to keep the stack frame size aligned.
- paddedArgsCount = roundArgumentCountToAlignFrame(paddedArgsCount);
</del><ins>+ if (codeBlock && argCountIncludingThis < codeBlock->numParameters())
+ this->arityMissMatch = true;
+ else
+ this->arityMissMatch = false;
+
+ // Round up argCountIncludingThis to keep the stack frame size aligned.
+ size_t paddedArgsCount = roundArgumentCountToAlignFrame(argCountIncludingThis);
</ins><span class="cx"> this->setPaddedArgCount(paddedArgsCount);
</span><span class="cx"> this->clearCurrentVPC();
</span><span class="cx"> this->setThisValue(thisValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterProtoCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h (173177 => 173178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-09-02 16:47:11 UTC (rev 173177)
+++ trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-09-02 16:52:35 UTC (rev 173178)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> Register argCountAndCodeOriginValue;
</span><span class="cx"> Register thisArg;
</span><span class="cx"> uint32_t paddedArgCount;
</span><ins>+ bool arityMissMatch;
</ins><span class="cx"> JSValue *args;
</span><span class="cx">
</span><span class="cx"> void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0);
</span><span class="lines">@@ -60,6 +61,8 @@
</span><span class="cx"> JSValue thisValue() const { return thisArg.Register::jsValue(); }
</span><span class="cx"> void setThisValue(JSValue value) { thisArg = value; }
</span><span class="cx">
</span><ins>+ bool needArityCheck() { return arityMissMatch; }
+
</ins><span class="cx"> JSValue argument(size_t argumentIndex)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(static_cast<int>(argumentIndex) < argumentCount());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCode.cpp (173177 => 173178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCode.cpp 2014-09-02 16:47:11 UTC (rev 173177)
+++ trunk/Source/JavaScriptCore/jit/JITCode.cpp 2014-09-02 16:52:35 UTC (rev 173178)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "LLIntThunks.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><ins>+#include "ProtoCallFrame.h"
</ins><span class="cx"> #include "RegisterPreservationWrapperGenerator.h"
</span><span class="cx"> #include <wtf/PrintStream.h>
</span><span class="cx">
</span><span class="lines">@@ -44,7 +45,15 @@
</span><span class="cx">
</span><span class="cx"> JSValue JITCode::execute(VM* vm, ProtoCallFrame* protoCallFrame)
</span><span class="cx"> {
</span><del>- JSValue result = JSValue::decode(vmEntryToJavaScript(executableAddress(), vm, protoCallFrame));
</del><ins>+ void* entryAddress;
+ JSFunction* function = jsCast<JSFunction*>(protoCallFrame->callee());
+
+ if (!function || !protoCallFrame->needArityCheck()) {
+ ASSERT(!protoCallFrame->needArityCheck());
+ entryAddress = executableAddress();
+ } else
+ entryAddress = addressForCall(*vm, function->executable(), MustCheckArity, RegisterPreservationNotRequired).executableAddress();
+ JSValue result = JSValue::decode(vmEntryToJavaScript(entryAddress, vm, protoCallFrame));
</ins><span class="cx"> return vm->exception() ? jsNull() : result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>