<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[23037] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23037">23037</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-07 10:26:57 -0800 (Wed, 07 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4941920> job_export_all() crash via launchd's Unix IPC</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logich">trunk/launchd/src/launchd_core_logic.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23036 => 23037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-07 17:39:53 UTC (rev 23036)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-07 18:26:57 UTC (rev 23037)
</span><span class="lines">@@ -976,9 +976,7 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- job_dispatch(j, false);
-
- return j;
</del><ins>+ return job_dispatch(j, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> launch_data_t
</span><span class="lines">@@ -1641,19 +1639,19 @@
</span><span class="cx"> void
</span><span class="cx"> jobmgr_dispatch_all(jobmgr_t jm)
</span><span class="cx"> {
</span><del>- jobmgr_t jmi;
- job_t ji;
</del><ins>+ jobmgr_t jmi, jmn;
+ job_t ji, jn;
</ins><span class="cx">
</span><del>- SLIST_FOREACH(jmi, &jm->submgrs, sle) {
</del><ins>+ SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
</ins><span class="cx"> jobmgr_dispatch_all(jmi);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SLIST_FOREACH(ji, &jm->jobs, sle) {
</del><ins>+ SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) {
</ins><span class="cx"> job_dispatch(ji, false);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void
</del><ins>+job_t
</ins><span class="cx"> job_dispatch(job_t j, bool kickstart)
</span><span class="cx"> {
</span><span class="cx"> /*
</span><span class="lines">@@ -1664,15 +1662,18 @@
</span><span class="cx"> *
</span><span class="cx"> * This is a classic example. The act of dispatching a job may delete it.
</span><span class="cx"> */
</span><del>- if (job_active(j)) {
- return;
- } else if (job_useless(j)) {
- job_remove(j);
- } else if (kickstart || job_keepalive(j)) {
- job_start(j);
- } else {
- job_watch(j);
</del><ins>+ if (!job_active(j)) {
+ if (job_useless(j)) {
+ job_remove(j);
+ return NULL;
+ } else if (kickstart || job_keepalive(j)) {
+ job_start(j);
+ } else {
+ job_watch(j);
+ }
</ins><span class="cx"> }
</span><ins>+
+ return j;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -3468,6 +3469,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* We don't need the _SAFE version because we return after the job_dispatch() */
</ins><span class="cx"> SLIST_FOREACH(ji, &jm->jobs, sle) {
</span><span class="cx"> SLIST_FOREACH(ms, &ji->machservices, sle) {
</span><span class="cx"> if (ms->port != p) {
</span><span class="lines">@@ -3613,11 +3615,11 @@
</span><span class="cx"> void
</span><span class="cx"> jobmgr_dispatch_all_semaphores(jobmgr_t jm)
</span><span class="cx"> {
</span><del>- jobmgr_t jmi;
</del><ins>+ jobmgr_t jmi, jmn;
</ins><span class="cx"> job_t ji, jn;
</span><span class="cx">
</span><span class="cx">
</span><del>- SLIST_FOREACH(jmi, &jm->submgrs, sle) {
</del><ins>+ SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
</ins><span class="cx"> jobmgr_dispatch_all_semaphores(jmi);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3979,10 +3981,12 @@
</span><span class="cx"> ms->must_match_uid = true;
</span><span class="cx"> ms->hide = true;
</span><span class="cx">
</span><del>- job_dispatch(ji, false);
</del><ins>+ ji = job_dispatch(ji, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- *up_cont = machservice_port(SLIST_FIRST(&ji->machservices));
</del><ins>+ if (job_assumes(j, ji != NULL)) {
+ *up_cont = machservice_port(SLIST_FIRST(&ji->machservices));
+ }
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -4538,8 +4542,12 @@
</span><span class="cx"> memcpy(jr->j_binpref, bin_pref, sizeof(jr->j_binpref));
</span><span class="cx"> jr->j_binpref_cnt = binpref_cnt;
</span><span class="cx">
</span><del>- job_dispatch(jr, true);
</del><ins>+ jr = job_dispatch(jr, true);
</ins><span class="cx">
</span><ins>+ if (!job_assumes(j, jr != NULL)) {
+ return BOOTSTRAP_NO_MEMORY;
+ }
+
</ins><span class="cx"> if (!job_setup_machport(jr)) {
</span><span class="cx"> job_remove(jr);
</span><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.h (23036 => 23037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.h 2007-02-07 17:39:53 UTC (rev 23036)
+++ trunk/launchd/src/launchd_core_logic.h 2007-02-07 18:26:57 UTC (rev 23037)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> launch_data_t job_export_all(void);
</span><span class="cx">
</span><span class="cx"> job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv, const char *stdinpath);
</span><del>-void job_dispatch(job_t j, bool kickstart);
</del><ins>+job_t job_dispatch(job_t j, bool kickstart); /* returns j on success, NULL on job removal */
</ins><span class="cx"> bool job_active(job_t j);
</span><span class="cx"> launch_data_t job_export(job_t j);
</span><span class="cx"> void job_stop(job_t j);
</span></span></pre>
</div>
</div>
</body>
</html>