<!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>[207843] trunk/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/207843">207843</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 14:10:46 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: fix unknown section name handling, and check for section size overflow
https://bugs.webkit.org/show_bug.cgi?id=163959
See: https://github.com/WebAssembly/design/blob/master/BinaryEncoding.md#high-level-structure
Name length and name are already included in the payload length.
Reviewed by Filip Pizlo.
* wasm/WasmModuleParser.cpp:
(JSC::Wasm::ModuleParser::parse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmModuleParsercpp">trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207842 => 207843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 20:33:46 UTC (rev 207842)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 21:10:46 UTC (rev 207843)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-25 JF Bastien <jfbastien@apple.com>
+
+ WebAssembly: fix unknown section name handling, and check for section size overflow
+ https://bugs.webkit.org/show_bug.cgi?id=163959
+
+ See: https://github.com/WebAssembly/design/blob/master/BinaryEncoding.md#high-level-structure
+
+ Name length and name are already included in the payload length.
+
+ Reviewed by Filip Pizlo.
+
+ * wasm/WasmModuleParser.cpp:
+ (JSC::Wasm::ModuleParser::parse):
+
</ins><span class="cx"> 2016-10-25 Christopher Reid <Christopher.Reid@am.sony.com>
</span><span class="cx">
</span><span class="cx"> jsc.cpp is leaking memory allocated by readline in runInteractive
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmModuleParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp (207842 => 207843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp 2016-10-25 20:33:46 UTC (rev 207842)
+++ trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp 2016-10-25 21:10:46 UTC (rev 207843)
</span><span class="lines">@@ -88,24 +88,6 @@
</span><span class="cx"> if (sectionByte) {
</span><span class="cx"> if (sectionByte < Sections::Unknown)
</span><span class="cx"> section = static_cast<Sections::Section>(sectionByte);
</span><del>- } else {
- uint32_t sectionNameLength;
- if (!parseVarUInt32(sectionNameLength)) {
- // FIXME improve error message https://bugs.webkit.org/show_bug.cgi?id=163919
- m_errorMessage = "couldn't get section name length";
- return false;
- }
-
- // Make sure we can read up to the section's size.
- if (m_offset + sectionNameLength + WTF::LEBDecoder::max32BitLEBByteLength >= length()) {
- // FIXME improve error message https://bugs.webkit.org/show_bug.cgi?id=163919
- m_errorMessage = "section length is bigger than actual size";
- return false;
- }
-
- // We don't support any custom sections yet.
-
- m_offset += sectionNameLength;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!Sections::validateOrder(previousSection, section)) {
</span><span class="lines">@@ -121,8 +103,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned end = m_offset + sectionLength;
</del><ins>+ if (sectionLength > length() - m_offset) {
+ // FIXME improve error message https://bugs.webkit.org/show_bug.cgi?id=163919
+ m_errorMessage = "section content would overflow Module's size";
+ return false;
+ }
</ins><span class="cx">
</span><ins>+ auto end = m_offset + sectionLength;
+
</ins><span class="cx"> switch (section) {
</span><span class="cx">
</span><span class="cx"> case Sections::Memory: {
</span><span class="lines">@@ -174,6 +162,7 @@
</span><span class="cx"> default: {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLogLn("Unknown section, skipping.");
</span><ins>+ // Ignore section's name LEB and bytes: they're already included in sectionLength.
</ins><span class="cx"> m_offset += sectionLength;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>