<!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>[211535] trunk/Source/WebKit2</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/211535">211535</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 14:52:02 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>IPC::Connection receive ports should be guarded
https://bugs.webkit.org/show_bug.cgi?id=167704
Reviewed by Tim Horton.
Guarding receive rights will make sure that they won't be closed accidentally. They are created
with a context pointer and can only be unguarded or destructed with the same context pointer.
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::platformInvalidate):
Use mach_port_destruct and pass the connection pointer as the context.
(IPC::Connection::platformInitialize):
Guard the server port with the connection pointer as the context.
(IPC::Connection::open):
Use mach_port_construct to create the port which lets us avoid a call to mach_port_set_attributes and setMachPortQueueLength.
Make the port guarded and use the connection pointer as the context.
(IPC::createReceiveSource):
Get rid of this and just duplicate the five lines of code in two places. For the receive port we want to use mach_port_destruct
in our cancel handler.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211534 => 211535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-01 22:41:52 UTC (rev 211534)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-01 22:52:02 UTC (rev 211535)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-02-01 Anders Carlsson <andersca@apple.com>
+
+ IPC::Connection receive ports should be guarded
+ https://bugs.webkit.org/show_bug.cgi?id=167704
+
+ Reviewed by Tim Horton.
+
+ Guarding receive rights will make sure that they won't be closed accidentally. They are created
+ with a context pointer and can only be unguarded or destructed with the same context pointer.
+
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::platformInvalidate):
+ Use mach_port_destruct and pass the connection pointer as the context.
+
+ (IPC::Connection::platformInitialize):
+ Guard the server port with the connection pointer as the context.
+
+ (IPC::Connection::open):
+ Use mach_port_construct to create the port which lets us avoid a call to mach_port_set_attributes and setMachPortQueueLength.
+ Make the port guarded and use the connection pointer as the context.
+
+ (IPC::createReceiveSource):
+ Get rid of this and just duplicate the five lines of code in two places. For the receive port we want to use mach_port_destruct
+ in our cancel handler.
+
</ins><span class="cx"> 2017-02-01 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement the alwaysRunsAtBackgroundPriority WK2 setting using thread QoS.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (211534 => 211535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2017-02-01 22:41:52 UTC (rev 211534)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2017-02-01 22:52:02 UTC (rev 211535)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_receivePort) {
</span><del>- mach_port_mod_refs(mach_task_self(), m_receivePort, MACH_PORT_RIGHT_RECEIVE, -1);
</del><ins>+ mach_port_destruct(mach_task_self(), m_receivePort, 0, reinterpret_cast<mach_port_context_t>(this));
</ins><span class="cx"> m_receivePort = MACH_PORT_NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -170,6 +170,8 @@
</span><span class="cx"> if (m_isServer) {
</span><span class="cx"> m_receivePort = identifier.port;
</span><span class="cx"> m_sendPort = MACH_PORT_NULL;
</span><ins>+
+ mach_port_guard(mach_task_self(), m_receivePort, reinterpret_cast<mach_port_context_t>(this), true);
</ins><span class="cx"> } else {
</span><span class="cx"> m_receivePort = MACH_PORT_NULL;
</span><span class="cx"> m_sendPort = identifier.port;
</span><span class="lines">@@ -181,19 +183,6 @@
</span><span class="cx"> m_xpcConnection = identifier.xpcConnection;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename Function>
-static dispatch_source_t createReceiveSource(mach_port_t receivePort, WorkQueue& workQueue, Function&& function)
-{
- dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, receivePort, 0, workQueue.dispatchQueue());
- dispatch_source_set_event_handler(source, function);
-
- dispatch_source_set_cancel_handler(source, ^{
- mach_port_mod_refs(mach_task_self(), receivePort, MACH_PORT_RIGHT_RECEIVE, -1);
- });
-
- return source;
-}
-
</del><span class="cx"> bool Connection::open()
</span><span class="cx"> {
</span><span class="cx"> if (m_isServer) {
</span><span class="lines">@@ -205,17 +194,21 @@
</span><span class="cx"> ASSERT(m_sendPort);
</span><span class="cx">
</span><span class="cx"> // Create the receive port.
</span><del>- mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_receivePort);
</del><ins>+ uint32_t flags = MPO_CONTEXT_AS_GUARD | MPO_QLIMIT | MPO_STRICT | MPO_INSERT_SEND_RIGHT;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_DENAP_RECEIVER, (mach_port_info_t)0, 0);
</del><ins>+ flags |= MPO_DENAP_RECEIVER;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ mach_port_options_t portOptions;
+ portOptions.flags = flags;
+ portOptions.mpl.mpl_qlimit = MACH_PORT_QLIMIT_LARGE;
+ mach_port_construct(mach_task_self(), &portOptions, reinterpret_cast<mach_port_context_t>(this), &m_receivePort);
+
</ins><span class="cx"> m_isConnected = true;
</span><span class="cx">
</span><del>- // Send the initialize message, which contains a send right for the server to use.
</del><span class="cx"> auto encoder = std::make_unique<Encoder>("IPC", "InitializeConnection", 0);
</span><del>- encoder->encode(MachPort(m_receivePort, MACH_MSG_TYPE_MAKE_SEND));
</del><ins>+ encoder->encode(MachPort(m_receivePort, MACH_MSG_TYPE_MOVE_SEND));
</ins><span class="cx">
</span><span class="cx"> initializeSendSource();
</span><span class="cx">
</span><span class="lines">@@ -222,20 +215,24 @@
</span><span class="cx"> sendMessage(WTFMove(encoder), { });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Change the message queue length for the receive port.
- setMachPortQueueLength(m_receivePort, MACH_PORT_QLIMIT_LARGE);
-
- // Register the data available handler.
</del><span class="cx"> RefPtr<Connection> connection(this);
</span><del>- m_receiveSource = createReceiveSource(m_receivePort, m_connectionQueue, [connection] {
</del><ins>+ m_receiveSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, m_receivePort, 0, m_connectionQueue->dispatchQueue());
+ dispatch_source_set_event_handler(m_receiveSource, [connection] {
</ins><span class="cx"> connection->receiveSourceEventHandler();
</span><span class="cx"> });
</span><ins>+ dispatch_source_set_cancel_handler(m_receiveSource, [connection, receivePort = m_receivePort] {
+ mach_port_destruct(mach_task_self(), receivePort, 0, reinterpret_cast<mach_port_context_t>(connection.get()));
+ });
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="cx"> if (m_exceptionPort) {
</span><del>- m_exceptionPortDataAvailableSource = createReceiveSource(m_exceptionPort, m_connectionQueue, [connection] {
</del><ins>+ m_exceptionPortDataAvailableSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, m_exceptionPort, 0, m_connectionQueue.dispatchQueue());
+ dispatch_source_set_event_handler(source, [connection] {
</ins><span class="cx"> connection->exceptionSourceEventHandler();
</span><span class="cx"> });
</span><ins>+ dispatch_source_set_cancel_handler(source, [connection, exceptionPort = connection->m_exceptionPort] {
+ mach_port_mod_refs(mach_task_self(), exceptionPort, MACH_PORT_RIGHT_RECEIVE, -1);
+ });
</ins><span class="cx">
</span><span class="cx"> auto encoder = std::make_unique<Encoder>("IPC", "SetExceptionPort", 0);
</span><span class="cx"> encoder->encode(MachPort(m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND));
</span></span></pre>
</div>
</div>
</body>
</html>