Changeset 23299

Timestamp:

07/10/07 13:24:39 (17 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5318461> Bug: launchd_core_logic.c:3739 (23294):8: (errno = task_set_special_port(mach_task_self(), which_port, ms->port)) == KERN_SUCCESS

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (6 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -122 +122 @@
 struct machservice {
         SLIST_ENTRY(machservice) sle;
+        SLIST_ENTRY(machservice) special_port_sle;
         LIST_ENTRY(machservice) name_hash_sle;
         LIST_ENTRY(machservice) port_hash_sle;
@@ -128 +129 @@
         unsigned int            gen_num;
         mach_port_name_t        port;
-        unsigned int            isActive:1, reset:1, recv:1, hide:1, kUNCServer:1, per_user_hack:1, debug_on_close:1, per_pid:1;
+        unsigned int            isActive:1, reset:1, recv:1, hide:1, kUNCServer:1, per_user_hack:1, debug_on_close:1, per_pid:1, special_port_num:10;
         const char              name[0];
 };
+
+static SLIST_HEAD(, machservice) special_ports; /* hack, this should be per jobmgr_t */
 
 #define PORT_HASH_SIZE 32
@@ -3741 +3744 @@
                                 break;
                         default:
-                                job_assumes(ms->job, (errno = task_set_special_port(mach_task_self(), which_port, ms->port)) == KERN_SUCCESS);
+                                ms->special_port_num = which_port;
+                                SLIST_INSERT_HEAD(&special_ports, ms, special_port_sle);
                                 break;
                         }
@@ -4186 +4190 @@
         job_log(j, LOG_INFO, "Mach service deleted%s: %s", port_died ? " (port died)" : "", ms->name);
 
+        if (ms->special_port_num) {
+                SLIST_REMOVE(&special_ports, ms, machservice, special_port_sle);
+        }
+
         SLIST_REMOVE(&j->machservices, ms, machservice, sle);
         LIST_REMOVE(ms, name_hash_sle);
@@ -5023 +5031 @@
 job_mig_post_fork_ping(job_t j, task_t child_task)
 {
+        struct machservice *ms;
+
         if (!launchd_assumes(j != NULL)) {
                 return BOOTSTRAP_NO_MEMORY;
@@ -5030 +5040 @@
 
         job_setup_exception_port(j, child_task);
+
+        SLIST_FOREACH(ms, &special_ports, special_port_sle) {
+                if (j->per_user && (ms->special_port_num != TASK_ACCESS_PORT)) {
+                        /* The TASK_ACCESS_PORT funny business is to workaround 5325399. */
+                        continue;
+                }
+                job_assumes(j, (errno = task_set_special_port(child_task, ms->special_port_num, ms->port)) == KERN_SUCCESS);
+        }
 
         job_assumes(j, launchd_mport_deallocate(child_task) == KERN_SUCCESS);