Changeset 23459

Timestamp:

2007-12-07 13:15:23 (10 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5502233> SULeoCeto: ReportCrash can deadlock against itself if it crashes prior to main()

Location:

branches/SULeopard/launchd/src

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (7 diffs)
• launchd_core_logic.c (modified) (7 diffs)
• launchd_runtime.c (modified) (5 diffs)
• launchd_runtime.h (modified) (1 diff)
• liblaunch_private.h (modified) (1 diff)

branches/SULeopard/launchd/src/Makefile.am

@@ -3 +3 @@
 CLEANFILES = protocol_vproc.h protocol_vprocServer.c protocol_vprocUser.c protocol_vprocServer.h                \
              launchd_internal.h launchd_internalServer.h launchd_internalServer.c launchd_internalUser.c        \
-             notifyServer.c notifyServer.h job_replyUser.c job_reply.h __version.c
+             notifyServer.c notifyServer.h job_replyUser.c job_reply.h __version.c mach_excServer.c mach_excServer.h
 
 protocol_vproc.h protocol_vprocServer.c protocol_vprocUser.c protocol_vprocServer.h: $(srcdir)/protocol_job.defs
@@ -49 +49 @@
 launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter
 launchd_LDFLAGS = -lbsm
-launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c
+launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c mach_excServer.c
 
-launchd_runtime.c:: notifyServer.h launchd_internal.h
+launchd_runtime.c:: notifyServer.h launchd_internal.h mach_excServer.h
 launchd_core_logic.c:: protocol_vproc.h job_reply.h protocol_vprocServer.h
 
@@ -58 +58 @@
 notifyServer.c notifyServer.h: /usr/include/mach/notify.defs
         mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader notifyServer.h /usr/include/mach/notify.defs
+
+mach_excServer.c mach_excServer.h: /usr/include/mach/mach_exc.defs
+        mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader mach_excServer.h /usr/include/mach/mach_exc.defs
 
 job_replyUser.c job_reply.h: $(srcdir)/protocol_job_reply.defs

branches/SULeopard/launchd/src/Makefile.in

@@ -97 +97 @@
         launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c \
         launchd_internalUser.c launchd_internalServer.c \
-        job_replyUser.c launchd_runtime.c launchd_runtime_kill.c
+        job_replyUser.c launchd_runtime.c launchd_runtime_kill.c \
+        mach_excServer.c
 @LIBS_ONLY_FALSE@am_launchd_OBJECTS = launchd-launchd.$(OBJEXT) \
 @LIBS_ONLY_FALSE@       launchd-launchd_core_logic.$(OBJEXT) \
@@ -107 +108 @@
 @LIBS_ONLY_FALSE@       launchd-job_replyUser.$(OBJEXT) \
 @LIBS_ONLY_FALSE@       launchd-launchd_runtime.$(OBJEXT) \
-@LIBS_ONLY_FALSE@       launchd-launchd_runtime_kill.$(OBJEXT)
+@LIBS_ONLY_FALSE@       launchd-launchd_runtime_kill.$(OBJEXT) \
+@LIBS_ONLY_FALSE@       launchd-mach_excServer.$(OBJEXT)
 launchd_OBJECTS = $(am_launchd_OBJECTS)
 launchd_LDADD = $(LDADD)
@@ -239 +241 @@
 CLEANFILES = protocol_vproc.h protocol_vprocServer.c protocol_vprocUser.c protocol_vprocServer.h                \
              launchd_internal.h launchd_internalServer.h launchd_internalServer.c launchd_internalUser.c        \
-             notifyServer.c notifyServer.h job_replyUser.c job_reply.h __version.c
+             notifyServer.c notifyServer.h job_replyUser.c job_reply.h __version.c mach_excServer.c mach_excServer.h
 
 @LIBS_ONLY_TRUE@noinst_LIBRARIES = liblaunch.a liblaunch_profile.a
@@ -254 +256 @@
 @LIBS_ONLY_FALSE@launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter
 @LIBS_ONLY_FALSE@launchd_LDFLAGS = -lbsm
-@LIBS_ONLY_FALSE@launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c
+@LIBS_ONLY_FALSE@launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c mach_excServer.c
 @LIBS_ONLY_FALSE@launchproxy_LDFLAGS = -weak_framework Security
 @LIBS_ONLY_FALSE@man1_MANS = wait4path.1 launchctl.1
@@ -424 +426 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-launchd_runtime_kill.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-launchd_unix_ipc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-mach_excServer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-notifyServer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-protocol_vprocServer.Po@am__quote@
@@ -788 +791 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd_runtime_kill.obj `if test -f 'launchd_runtime_kill.c'; then $(CYGPATH_W) 'launchd_runtime_kill.c'; else $(CYGPATH_W) '$(srcdir)/launchd_runtime_kill.c'; fi`
+
+launchd-mach_excServer.o: mach_excServer.c
+@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -MT launchd-mach_excServer.o -MD -MP -MF $(DEPDIR)/launchd-mach_excServer.Tpo -c -o launchd-mach_excServer.o `test -f 'mach_excServer.c' || echo '$(srcdir)/'`mach_excServer.c
+@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/launchd-mach_excServer.Tpo $(DEPDIR)/launchd-mach_excServer.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='mach_excServer.c' object='launchd-mach_excServer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-mach_excServer.o `test -f 'mach_excServer.c' || echo '$(srcdir)/'`mach_excServer.c
+
+launchd-mach_excServer.obj: mach_excServer.c
+@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -MT launchd-mach_excServer.obj -MD -MP -MF $(DEPDIR)/launchd-mach_excServer.Tpo -c -o launchd-mach_excServer.obj `if test -f 'mach_excServer.c'; then $(CYGPATH_W) 'mach_excServer.c'; else $(CYGPATH_W) '$(srcdir)/mach_excServer.c'; fi`
+@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/launchd-mach_excServer.Tpo $(DEPDIR)/launchd-mach_excServer.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='mach_excServer.c' object='launchd-mach_excServer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-mach_excServer.obj `if test -f 'mach_excServer.c'; then $(CYGPATH_W) 'mach_excServer.c'; else $(CYGPATH_W) '$(srcdir)/mach_excServer.c'; fi`
 install-man1: $(man1_MANS) $(man_MANS)
         @$(NORMAL_INSTALL)
@@ -1149 +1166 @@
 @LIBS_ONLY_TRUE@        cp liblaunch_profile.a $(DESTDIR)/usr/local/lib/system/liblaunch_profile.a
 
-@LIBS_ONLY_FALSE@launchd_runtime.c:: notifyServer.h launchd_internal.h
+@LIBS_ONLY_FALSE@launchd_runtime.c:: notifyServer.h launchd_internal.h mach_excServer.h
 @LIBS_ONLY_FALSE@launchd_core_logic.c:: protocol_vproc.h job_reply.h protocol_vprocServer.h
 
 @LIBS_ONLY_FALSE@notifyServer.c notifyServer.h: /usr/include/mach/notify.defs
 @LIBS_ONLY_FALSE@       mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader notifyServer.h /usr/include/mach/notify.defs
+
+@LIBS_ONLY_FALSE@mach_excServer.c mach_excServer.h: /usr/include/mach/mach_exc.defs
+@LIBS_ONLY_FALSE@       mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader mach_excServer.h /usr/include/mach/mach_exc.defs
 
 @LIBS_ONLY_FALSE@job_replyUser.c job_reply.h: $(srcdir)/protocol_job_reply.defs

branches/SULeopard/launchd/src/launchd_core_logic.c

@@ -334 +334 @@
         char *stdoutpath;
         char *stderrpath;
+        char *alt_exc_handler;
         struct machservice *lastlookup;
         unsigned int lastlookup_gennum;
@@ -361 +362 @@
                      wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1, start_on_mount:1,
                      per_user:1, hopefully_exits_first:1, deny_unknown_mslookups:1, unload_at_mig_return:1, abandon_pg:1,
-                     poll_for_vfs_changes:1;
+                     poll_for_vfs_changes:1, internal_exc_handler:1;
         const char label[0];
 };
@@ -862 +863 @@
                 free(j->stderrpath);
         }
+        if (j->alt_exc_handler) {
+                free(j->alt_exc_handler);
+        }
         if (j->seatbelt_profile) {
                 free(j->seatbelt_profile);
@@ -1324 +1328 @@
                 }
                 break;
+        case 'm':
+        case 'M':
+                if (strcasecmp(key, LAUNCH_JOBKEY_MACHEXCEPTIONHANDLER) == 0) {
+                        j->internal_exc_handler = value;
+                        found_key = true;
+                }
+                break;
         case 'i':
         case 'I':
@@ -1377 +1388 @@
 
         switch (key[0]) {
+        case 'm':
+        case 'M':
+                if (strcasecmp(key, LAUNCH_JOBKEY_MACHEXCEPTIONHANDLER) == 0) {
+                        where2put = &j->alt_exc_handler;
+                }
+                break;
         case 'p':
         case 'P':
@@ -4003 +4020 @@
 job_setup_exception_port(job_t j, task_t target_task)
 {
+        struct machservice *ms;
         thread_state_flavor_t f = 0;
-
-        if (!the_exception_server) {
+        mach_port_t exc_port = the_exception_server;
+
+        if (j->alt_exc_handler) {
+                ms = jobmgr_lookup_service(j->mgr, j->alt_exc_handler, true, 0);
+                if (ms) {
+                        exc_port = machservice_port(ms);
+                } else {
+                        job_log(j, LOG_WARNING, "Falling back to default Mach exception handler. Could not find: %s", j->alt_exc_handler);
+                }
+        } else if (j->internal_exc_handler) {
+                exc_port = runtime_get_kernel_port();
+        } else if (!exc_port) {
                 return;
         }
@@ -4016 +4044 @@
 
         if (target_task) {
-                job_assumes(j, task_set_exception_ports(target_task, EXC_MASK_CRASH, the_exception_server,
+                job_assumes(j, task_set_exception_ports(target_task, EXC_MASK_CRASH, exc_port,
                                         EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, f) == KERN_SUCCESS);
-        } else if (getpid() == 1) {
+        } else if (getpid() == 1 && the_exception_server) {
                 mach_port_t mhp = mach_host_self();
                 job_assumes(j, host_set_exception_ports(mhp, EXC_MASK_CRASH, the_exception_server,

branches/SULeopard/launchd/src/launchd_runtime.c

@@ -62 +62 @@
 #include "launchd_internal.h"
 #include "notifyServer.h"
+#include "mach_excServer.h"
 
 /* We shouldn't be including these */
@@ -87 +88 @@
 static void log_kevent_struct(int level, struct kevent *kev, int indx);
 
+static boolean_t launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply);
 static void record_caller_creds(mach_msg_header_t *mh);
 static void launchd_runtime2(mach_msg_size_t msg_size, mig_reply_error_t *bufRequest, mig_reply_error_t *bufReply);
@@ -115 +117 @@
 };
 static sigset_t sigign_set;
+
+mach_port_t
+runtime_get_kernel_port(void)
+{
+        return launchd_internal_port;
+}
 
 void
@@ -847 +855 @@
         if (launchd_internal_server_routine(Request)) {
                 return launchd_internal_server(Request, Reply);
-        }
-
-        return notify_server(Request, Reply);
+        } else if (notify_server_routine(Request)) {
+                return notify_server(Request, Reply);
+        } else {
+                return mach_exc_server(Request, Reply);
+        }
 }
 
@@ -1451 +1461 @@
         runtime_busy_cnt--;
 }
+
+kern_return_t
+catch_mach_exception_raise(mach_port_t exception_port, mach_port_t thread, mach_port_t task,
+                exception_type_t exception, mach_exception_data_t code, mach_msg_type_number_t codeCnt)
+{
+        runtime_syslog(LOG_NOTICE, "%s(): thread: 0x%x task: 0x%x type: 0x%x code: %p codeCnt: 0x%x",
+                        __func__, thread, task, exception, code, codeCnt);
+
+        launchd_assumes(launchd_mport_deallocate(thread) == KERN_SUCCESS);
+        launchd_assumes(launchd_mport_deallocate(task) == KERN_SUCCESS);
+
+        return 0;
+}
+
+kern_return_t
+catch_mach_exception_raise_state(mach_port_t exception_port,
+                exception_type_t exception, const mach_exception_data_t code, mach_msg_type_number_t codeCnt,
+                int *flavor, const thread_state_t old_state, mach_msg_type_number_t old_stateCnt,
+                thread_state_t new_state, mach_msg_type_number_t *new_stateCnt)
+{
+        runtime_syslog(LOG_NOTICE, "%s(): type: 0x%x code: %p codeCnt: 0x%x flavor: %p old_state: %p old_stateCnt: 0x%x new_state: %p new_stateCnt: %p",
+                        __func__, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt);
+
+        memcpy(new_state, old_state, old_stateCnt * sizeof(old_state[0]));
+        *new_stateCnt = old_stateCnt;
+
+        return 0;
+}
+
+kern_return_t
+catch_mach_exception_raise_state_identity(mach_port_t exception_port, mach_port_t thread, mach_port_t task,
+                exception_type_t exception, mach_exception_data_t code, mach_msg_type_number_t codeCnt,
+                int *flavor, thread_state_t old_state, mach_msg_type_number_t old_stateCnt,
+                thread_state_t new_state, mach_msg_type_number_t *new_stateCnt)
+{
+        runtime_syslog(LOG_NOTICE, "%s(): thread: 0x%x task: 0x%x type: 0x%x code: %p codeCnt: 0x%x flavor: %p old_state: %p old_stateCnt: 0x%x new_state: %p new_stateCnt: %p",
+                        __func__, thread, task, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt);
+
+        memcpy(new_state, old_state, old_stateCnt * sizeof(old_state[0]));
+        *new_stateCnt = old_stateCnt;
+
+        launchd_assumes(launchd_mport_deallocate(thread) == KERN_SUCCESS);
+        launchd_assumes(launchd_mport_deallocate(task) == KERN_SUCCESS);
+
+        return 0;
+}

branches/SULeopard/launchd/src/launchd_runtime.h

@@ -57 +57 @@
 typedef void (*timeout_callback)(void);
 
-boolean_t launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply);
+mach_port_t runtime_get_kernel_port(void);
 
 void runtime_add_ref(void);

branches/SULeopard/launchd/src/liblaunch_private.h

@@ -56 +56 @@
 #define LAUNCH_JOBKEY_SERVICEIPC                "ServiceIPC"
 #define LAUNCH_JOBKEY_BINARYORDERPREFERENCE     "BinaryOrderPreference"
+#define LAUNCH_JOBKEY_MACHEXCEPTIONHANDLER      "MachExceptionHandler"
 
 #define LAUNCH_JOBKEY_MACH_KUNCSERVER   "kUNCServer"