<!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>[197561] releases/WebKitGTK/webkit-2.4/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/197561">197561</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-04 05:20:00 -0800 (Fri, 04 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/193648">r193648</a> - Crashes on PPC64 due to mprotect() on address not aligned to the page size
https://bugs.webkit.org/show_bug.cgi?id=130237
Reviewed by Mark Lam.
Make sure that commitSize is at least as big as the page size.
* interpreter/JSStack.cpp:
(JSC::commitSize):
(JSC::JSStack::JSStack):
(JSC::JSStack::growSlowCase):
* interpreter/JSStack.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCoreinterpreterJSStackcpp">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCoreinterpreterJSStackh">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog (197560 => 197561)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog 2016-03-04 13:04:45 UTC (rev 197560)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog 2016-03-04 13:20:00 UTC (rev 197561)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-07 Alberto Garcia <berto@igalia.com>
+
+ Crashes on PPC64 due to mprotect() on address not aligned to the page size
+ https://bugs.webkit.org/show_bug.cgi?id=130237
+
+ Reviewed by Mark Lam.
+
+ Make sure that commitSize is at least as big as the page size.
+
+ * interpreter/JSStack.cpp:
+ (JSC::commitSize):
+ (JSC::JSStack::JSStack):
+ (JSC::JSStack::growSlowCase):
+ * interpreter/JSStack.h:
+
</ins><span class="cx"> 2014-04-09 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Ensure that LLINT accessing of the ProtoCallFrame is big endian friendly.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.cpp (197560 => 197561)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.cpp 2016-03-04 13:04:45 UTC (rev 197560)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.cpp 2016-03-04 13:20:00 UTC (rev 197561)
</span><span class="lines">@@ -42,6 +42,14 @@
</span><span class="cx"> return staticMutex;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static size_t commitSize()
+{
+ static size_t size = 0;
+ if (!size)
+ size = std::max(16 * 1024, getpagesize());
+ return size;
+}
+
</ins><span class="cx"> JSStack::JSStack(VM& vm, size_t capacity)
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> , m_end(0)
</span><span class="lines">@@ -49,7 +57,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(capacity && isPageAligned(capacity));
</span><span class="cx">
</span><del>- m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages);
</del><ins>+ m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize()), OSAllocator::JSVMStackPages);
</ins><span class="cx"> updateStackLimit(highAddress());
</span><span class="cx"> m_commitEnd = highAddress();
</span><span class="cx">
</span><span class="lines">@@ -78,7 +86,7 @@
</span><span class="cx"> // Compute the chunk size of additional memory to commit, and see if we
</span><span class="cx"> // have it is still within our budget. If not, we'll fail to grow and
</span><span class="cx"> // return false.
</span><del>- long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitSize);
</del><ins>+ long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitSize());
</ins><span class="cx"> if (reinterpret_cast<char*>(m_commitEnd) - delta <= reinterpret_cast<char*>(m_useableEnd))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCoreinterpreterJSStackh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.h (197560 => 197561)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.h 2016-03-04 13:04:45 UTC (rev 197560)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/interpreter/JSStack.h 2016-03-04 13:20:00 UTC (rev 197561)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const size_t defaultCapacity = 512 * 1024;
</span><del>- static const size_t commitSize = 16 * 1024;
</del><span class="cx"> // Allow 8k of excess registers before we start trying to reap the stack
</span><span class="cx"> static const ptrdiff_t maxExcessCapacity = 8 * 1024;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>