<!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>[159799] trunk/Source/WTF</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/159799">159799</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-26 19:35:14 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT_WITH_SECURITY_IMPLICATION should crash in a distinct way.
https://bugs.webkit.org/show_bug.cgi?id=124757
Change ASSERT_WITH_SECURITY_IMPLICATION to access a different address from CRASH()
in order to help screen fuzzing bugs.
Patch by Drew Yao <ayao@apple.com> on 2013-11-26
Reviewed by Brent Fulgham.
* wtf/Assertions.cpp:
* wtf/Assertions.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfAssertionsh">trunk/Source/WTF/wtf/Assertions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (159798 => 159799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-11-27 02:47:43 UTC (rev 159798)
+++ trunk/Source/WTF/ChangeLog 2013-11-27 03:35:14 UTC (rev 159799)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-11-26 Drew Yao <ayao@apple.com>
+
+ ASSERT_WITH_SECURITY_IMPLICATION should crash in a distinct way.
+ https://bugs.webkit.org/show_bug.cgi?id=124757
+
+ Change ASSERT_WITH_SECURITY_IMPLICATION to access a different address from CRASH()
+ in order to help screen fuzzing bugs.
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/Assertions.cpp:
+ * wtf/Assertions.h:
+
</ins><span class="cx"> 2013-11-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Upstream USE(IOSURFACE) from the iOS port
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (159798 => 159799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp 2013-11-27 02:47:43 UTC (rev 159798)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2013-11-27 03:35:14 UTC (rev 159799)
</span><span class="lines">@@ -346,6 +346,20 @@
</span><span class="cx"> ((void(*)())0)();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+void WTFCrashWithSecurityImplication()
+{
+ if (globalHook)
+ globalHook();
+ WTFReportBacktrace();
+ *(int *)(uintptr_t)0xfbadbeef = 0;
+ // More reliable, but doesn't say fbadbeef.
+#if COMPILER(CLANG)
+ __builtin_trap();
+#else
+ ((void(*)())0)();
+#endif
+}
</ins><span class="cx">
</span><span class="cx"> #if HAVE(SIGNAL_H)
</span><span class="cx"> static NO_RETURN void dumpBacktraceSignalHandler(int sig)
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (159798 => 159799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2013-11-27 02:47:43 UTC (rev 159798)
+++ trunk/Source/WTF/wtf/Assertions.h 2013-11-27 03:35:14 UTC (rev 159799)
</span><span class="lines">@@ -168,6 +168,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef CRASH_WITH_SECURITY_IMPLICATION
+#define CRASH_WITH_SECURITY_IMPLICATION() WTFCrashWithSecurityImplication()
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ WTF_EXPORT_PRIVATE void WTFCrashWithSecurityImplication() NO_RETURN_DUE_TO_CRASH;
+#ifdef __cplusplus
+}
+#endif
+
</ins><span class="cx"> /* BACKTRACE
</span><span class="cx">
</span><span class="cx"> Print a backtrace to the same location as ASSERT messages.
</span><span class="lines">@@ -219,8 +231,19 @@
</span><span class="cx"> #define ASSERT_UNUSED(variable, assertion) ((void)variable)
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifdef ADDRESS_SANITIZER
+#define ASSERT_WITH_SECURITY_IMPLICATION(assertion) \
+ (!(assertion) ? \
+ (WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion), \
+ CRASH_WITH_SECURITY_IMPLICATION()) : \
+ (void)0)
+
</ins><span class="cx"> #else
</span><ins>+#define ASSERT_WITH_SECURITY_IMPLICATION(assertion) ((void)0)
+#endif
</ins><span class="cx">
</span><ins>+#else
+
</ins><span class="cx"> #define ASSERT(assertion) \
</span><span class="cx"> (!(assertion) ? \
</span><span class="cx"> (WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion), \
</span><span class="lines">@@ -242,28 +265,19 @@
</span><span class="cx">
</span><span class="cx"> #define NO_RETURN_DUE_TO_ASSERT NO_RETURN_DUE_TO_CRASH
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> /* ASSERT_WITH_SECURITY_IMPLICATION
</span><del>-
</del><ins>+
</ins><span class="cx"> Failure of this assertion indicates a possible security vulnerability.
</span><span class="cx"> Class of vulnerabilities that it tests include bad casts, out of bounds
</span><span class="cx"> accesses, use-after-frees, etc. Please file a bug using the security
</span><span class="cx"> template - https://bugs.webkit.org/enter_bug.cgi?product=Security.
</span><del>-
</del><ins>+
</ins><span class="cx"> */
</span><del>-#ifdef ADDRESS_SANITIZER
-
</del><span class="cx"> #define ASSERT_WITH_SECURITY_IMPLICATION(assertion) \
</span><span class="cx"> (!(assertion) ? \
</span><span class="cx"> (WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion), \
</span><del>- CRASH()) : \
</del><ins>+ CRASH_WITH_SECURITY_IMPLICATION()) : \
</ins><span class="cx"> (void)0)
</span><del>-
-#else
-
-#define ASSERT_WITH_SECURITY_IMPLICATION(assertion) ASSERT(assertion)
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* ASSERT_WITH_MESSAGE */
</span></span></pre>
</div>
</div>
</body>
</html>