<!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>[211479] 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/211479">211479</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-02-01 03:29:25 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>ArityFixup should adjust SP first
https://bugs.webkit.org/show_bug.cgi?id=167239
Reviewed by Michael Saboff.
JSTests:
Significantly large arity fixup reliably causes this crash.
* stress/arity-fixup-should-not-touch-stack-area-below-sp.js: Added.
Source/JavaScriptCore:
Arity fixup extends the stack and copy/fill the stack with
the values. At that time, we accidentally read/write stack
space below the stack pointer. As a result, we touch the area
of the stack space below the x64 red zone. These areas are unsafe.
OS may corrupt this space when constructing a signal stack.
The Linux kernel could not populate the pages for this space
and causes segmentation fault. This patch changes the stack
pointer before performing the arity fixup.
* jit/ThunkGenerators.cpp:
(JSC::arityFixupGenerator):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:</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="#trunkSourceJavaScriptCorejitThunkGeneratorscpp">trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressarityfixupshouldnottouchstackareabelowspjs">trunk/JSTests/stress/arity-fixup-should-not-touch-stack-area-below-sp.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (211478 => 211479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2017-02-01 10:59:17 UTC (rev 211478)
+++ trunk/JSTests/ChangeLog 2017-02-01 11:29:25 UTC (rev 211479)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-01 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ ArityFixup should adjust SP first
+ https://bugs.webkit.org/show_bug.cgi?id=167239
+
+ Reviewed by Michael Saboff.
+
+ Significantly large arity fixup reliably causes this crash.
+
+ * stress/arity-fixup-should-not-touch-stack-area-below-sp.js: Added.
+
</ins><span class="cx"> 2017-01-31 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Move slow-running microbenchmarks out of JSTests/microbenchmarks
</span></span></pre></div>
<a id="trunkJSTestsstressarityfixupshouldnottouchstackareabelowspjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/arity-fixup-should-not-touch-stack-area-below-sp.js (0 => 211479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/arity-fixup-should-not-touch-stack-area-below-sp.js (rev 0)
+++ trunk/JSTests/stress/arity-fixup-should-not-touch-stack-area-below-sp.js 2017-02-01 11:29:25 UTC (rev 211479)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+var args = "y,".repeat(30000);
+var g = Function(args, "return 0");
+for (var i = 0; i < 1e3; ++i) {
+ g();
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (211478 => 211479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-02-01 10:59:17 UTC (rev 211478)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-02-01 11:29:25 UTC (rev 211479)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-01 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ ArityFixup should adjust SP first
+ https://bugs.webkit.org/show_bug.cgi?id=167239
+
+ Reviewed by Michael Saboff.
+
+ Arity fixup extends the stack and copy/fill the stack with
+ the values. At that time, we accidentally read/write stack
+ space below the stack pointer. As a result, we touch the area
+ of the stack space below the x64 red zone. These areas are unsafe.
+ OS may corrupt this space when constructing a signal stack.
+ The Linux kernel could not populate the pages for this space
+ and causes segmentation fault. This patch changes the stack
+ pointer before performing the arity fixup.
+
+ * jit/ThunkGenerators.cpp:
+ (JSC::arityFixupGenerator):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2017-01-31 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Make verifyEdge a RELEASE_ASSERT
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp (211478 => 211479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2017-02-01 10:59:17 UTC (rev 211478)
+++ trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2017-02-01 11:29:25 UTC (rev 211479)
</span><span class="lines">@@ -440,6 +440,15 @@
</span><span class="cx">
</span><span class="cx"> jit.neg64(JSInterfaceJIT::argumentGPR0);
</span><span class="cx">
</span><ins>+ // Adjust call frame register and stack pointer to account for missing args.
+ // We need to change the stack pointer first before performing copy/fill loops.
+ // This stack space below the stack pointer is considered unsed by OS. Therefore,
+ // OS may corrupt this space when constructing a signal stack.
+ jit.move(JSInterfaceJIT::argumentGPR0, extraTemp);
+ jit.lshift64(JSInterfaceJIT::TrustedImm32(3), extraTemp);
+ jit.addPtr(extraTemp, JSInterfaceJIT::callFrameRegister);
+ jit.addPtr(extraTemp, JSInterfaceJIT::stackPointerRegister);
+
</ins><span class="cx"> // Move current frame down argumentGPR0 number of slots
</span><span class="cx"> JSInterfaceJIT::Label copyLoop(jit.label());
</span><span class="cx"> jit.load64(JSInterfaceJIT::regT3, extraTemp);
</span><span class="lines">@@ -455,12 +464,6 @@
</span><span class="cx"> jit.addPtr(JSInterfaceJIT::TrustedImm32(8), JSInterfaceJIT::regT3);
</span><span class="cx"> jit.branchAdd32(MacroAssembler::NonZero, JSInterfaceJIT::TrustedImm32(1), JSInterfaceJIT::argumentGPR2).linkTo(fillUndefinedLoop, &jit);
</span><span class="cx">
</span><del>- // Adjust call frame register and stack pointer to account for missing args
- jit.move(JSInterfaceJIT::argumentGPR0, extraTemp);
- jit.lshift64(JSInterfaceJIT::TrustedImm32(3), extraTemp);
- jit.addPtr(extraTemp, JSInterfaceJIT::callFrameRegister);
- jit.addPtr(extraTemp, JSInterfaceJIT::stackPointerRegister);
-
</del><span class="cx"> done.link(&jit);
</span><span class="cx">
</span><span class="cx"> # if CPU(X86_64)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (211478 => 211479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2017-02-01 10:59:17 UTC (rev 211478)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2017-02-01 11:29:25 UTC (rev 211479)
</span><span class="lines">@@ -613,6 +613,10 @@
</span><span class="cx"> // Move frame up t1 slots
</span><span class="cx"> negi t1
</span><span class="cx"> move cfr, t3
</span><ins>+ move t1, t0
+ lshiftp 3, t0
+ addp t0, cfr
+ addp t0, sp
</ins><span class="cx"> .copyLoop:
</span><span class="cx"> loadi PayloadOffset[t3], t0
</span><span class="cx"> storei t0, PayloadOffset[t3, t1, 8]
</span><span class="lines">@@ -631,9 +635,6 @@
</span><span class="cx"> addp 8, t3
</span><span class="cx"> baddinz 1, t2, .fillLoop
</span><span class="cx">
</span><del>- lshiftp 3, t1
- addp t1, cfr
- addp t1, sp
</del><span class="cx"> .continue:
</span><span class="cx"> # Reload CodeBlock and PC, since the slow_path clobbered it.
</span><span class="cx"> loadp CodeBlock[cfr], t1
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (211478 => 211479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2017-02-01 10:59:17 UTC (rev 211478)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2017-02-01 11:29:25 UTC (rev 211479)
</span><span class="lines">@@ -525,6 +525,10 @@
</span><span class="cx"> move cfr, t3
</span><span class="cx"> subp CalleeSaveSpaceAsVirtualRegisters * 8, t3
</span><span class="cx"> addi CalleeSaveSpaceAsVirtualRegisters, t2
</span><ins>+ move t1, t0
+ lshiftp 3, t0
+ addp t0, cfr
+ addp t0, sp
</ins><span class="cx"> .copyLoop:
</span><span class="cx"> loadq [t3], t0
</span><span class="cx"> storeq t0, [t3, t1, 8]
</span><span class="lines">@@ -539,10 +543,6 @@
</span><span class="cx"> addp 8, t3
</span><span class="cx"> baddinz 1, t2, .fillLoop
</span><span class="cx">
</span><del>- lshiftp 3, t1
- addp t1, cfr
- addp t1, sp
-
</del><span class="cx"> .continue:
</span><span class="cx"> # Reload CodeBlock and reset PC, since the slow_path clobbered them.
</span><span class="cx"> loadp CodeBlock[cfr], t1
</span></span></pre>
</div>
</div>
</body>
</html>