Changeset 23219

Timestamp:

04/12/07 14:35:37 (21 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/4945275> setuid processes should have their exception ports repointed at the ReportCrash launchdaemon

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -372 +372 @@
 static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
 static void job_log_bug(job_t j, const char *rcs_rev, const char *path, unsigned int line, const char *test);
+static void job_set_exeception_port(job_t j, mach_port_t port);
 static kern_return_t job_handle_mpm_wait(job_t j, mach_port_t srp, int *waitstatus);
 
@@ -3398 +3399 @@
 #endif
 
-        job_assumes(j, task_set_exception_ports(target_task, em, the_exception_server,
-                                EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, f) == KERN_SUCCESS);
-
+        if (target_task) {
+                job_assumes(j, task_set_exception_ports(target_task, em, the_exception_server,
+                                        EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, f) == KERN_SUCCESS);
+        } else if (getpid() == 1) {
+                mach_port_t mhp = mach_host_self();
+                job_assumes(j, host_set_exception_ports(mhp, em, the_exception_server,
+                                        EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, f) == KERN_SUCCESS);
+                job_assumes(j, launchd_mport_deallocate(mhp) == KERN_SUCCESS);
+        }
+
+}
+
+void
+job_set_exeception_port(job_t j, mach_port_t port)
+{
+        if (!the_exception_server) {
+                the_exception_server = port;
+                job_setup_exception_port(j, 0);
+        } else {
+                job_log(j, LOG_WARNING, "The exception server is already claimed!");
+        }
 }
 
@@ -3448 +3467 @@
                         ms->hide = b;
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_MACH_EXCEPTIONSERVER) == 0) {
-                        if (!the_exception_server) {
-                                the_exception_server = ms->port;
-                        } else {
-                                job_log(ms->job, LOG_WARNING, "The exception server is already claimed!");
-                        }
+                        job_set_exeception_port(ms->job, ms->port);
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_MACH_KUNCSERVER) == 0) {
                         ms->kUNCServer = b;
@@ -3459 +3474 @@
                 break;
         case LAUNCH_DATA_DICTIONARY:
-                if (!the_exception_server) {
-                        the_exception_server = ms->port;
-                } else {
-                        job_log(ms->job, LOG_WARNING, "The exception server is already claimed!");
-                }
+                job_set_exeception_port(ms->job, ms->port);
                 break;
         default: