December 2006 - launchd-changes - lists.macosforge.org

[22967] trunk/launchd/src/launchd.c
by source_changes＠macosforge.org 04 Dec '06

04 Dec '06

Revision: 22967 http://trac.macosforge.org/projects/launchd/changeset/22967 Author: zarzycki(a)apple.com Date: 2006-12-04 09:44:33 -0800 (Mon, 04 Dec 2006) Log Message: ----------- It is probably, just probably, a good idea for the setjmp() to have a valid stack frame when returned to via longjmp(). :-P Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-12-04 17:34:49 UTC (rev 22966) +++ trunk/launchd/src/launchd.c 2006-12-04 17:44:33 UTC (rev 22967) @@ -294,6 +294,21 @@ job_dispatch(fbj, true); } + switch (setjmp(doom_doom_doom)) { + case SIGILL: + case SIGFPE: + syslog(LOG_EMERG, "We crashed at instruction: %p", crash_addr); + abort(); + case SIGBUS: + case SIGSEGV: + syslog(LOG_EMERG, "We crashed trying to read/write: %p", crash_addr); + abort(); + default: + abort(); + case 0: + break; + } + if (getpid() == 1) { handle_pid1_crashes_separately(); @@ -310,21 +325,6 @@ { struct sigaction fsa; - switch (setjmp(doom_doom_doom)) { - case SIGILL: - case SIGFPE: - syslog(LOG_EMERG, "We crashed at instruction: %p", crash_addr); - abort(); - case SIGBUS: - case SIGSEGV: - syslog(LOG_EMERG, "We crashed trying to read/write: %p", crash_addr); - abort(); - default: - abort(); - case 0: - break; - } - fsa.sa_sigaction = fatal_signal_handler; fsa.sa_flags = SA_SIGINFO; sigemptyset(&fsa.sa_mask);

1 0

[22966] trunk/launchd/src
by source_changes＠macosforge.org 04 Dec '06

04 Dec '06

Revision: 22966 http://trac.macosforge.org/projects/launchd/changeset/22966 Author: zarzycki(a)apple.com Date: 2006-12-04 09:34:49 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Less globals and no more need for a mount table update callback from the kernel (via kqueue). Now we can have stdout/stderr per jobmgr. Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-12-04 17:26:23 UTC (rev 22965) +++ trunk/launchd/src/launchctl.c 2006-12-04 17:34:49 UTC (rev 22966) @@ -1719,22 +1719,16 @@ stdio_cmd(int argc, char *const argv[]) { launch_data_t resp, msg, tmp; - int e, fd = -1, r = 0; + int e, r = 0; if (argc != 2) { fprintf(stderr, "usage: %s %s <path>\n", getprogname(), argv[0]); return 1; } - fd = open(argv[1], O_CREAT|O_APPEND|O_WRONLY|O_NOCTTY, DEFFILEMODE); - msg = launch_data_alloc(LAUNCH_DATA_DICTIONARY); - if (fd == -1) { - tmp = launch_data_new_string(argv[1]); - } else { - tmp = launch_data_new_fd(fd); - } + tmp = launch_data_new_string(argv[1]); if (!strcmp(argv[0], "stdout")) { launch_data_dict_insert(msg, tmp, LAUNCH_KEY_SETSTDOUT); @@ -1758,9 +1752,6 @@ r = 1; } - if (fd != -1) - close(fd); - launch_data_free(resp); return r; Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-12-04 17:26:23 UTC (rev 22965) +++ trunk/launchd/src/launchd.c 2006-12-04 17:34:49 UTC (rev 22966) @@ -81,12 +81,10 @@ extern char **environ; static void signal_callback(void *, struct kevent *); -static void fs_callback(void); static void ppidexit_callback(void); static void pfsystem_callback(void *, struct kevent *); static kq_callback kqsignal_callback = signal_callback; -static kq_callback kqfs_callback = (kq_callback)fs_callback; static kq_callback kqppidexit_callback = (kq_callback)ppidexit_callback; static kq_callback kqpfsystem_callback = pfsystem_callback; @@ -101,8 +99,6 @@ static void handle_pid1_crashes_separately(void); static bool re_exec_in_single_user_mode = false; -static char *pending_stdout = NULL; -static char *pending_stderr = NULL; static job_t rlcj = NULL; static jmp_buf doom_doom_doom; static void *crash_addr; @@ -269,9 +265,6 @@ monitor_networking_state(); - /* do this after pid1_magic_init() to not catch ourselves mounting stuff */ - launchd_assumes(kevent_mod(0, EVFILT_FS, EV_ADD, 0, 0, &kqfs_callback) != -1); - if (session_type) { pid_t pp = getppid(); @@ -475,29 +468,6 @@ } void -fs_callback(void) -{ - if (pending_stdout) { - int fd = open(pending_stdout, O_CREAT|O_APPEND|O_WRONLY|O_NOCTTY, DEFFILEMODE); - if (fd != -1) { - launchd_assumes(dup2(fd, STDOUT_FILENO) != -1); - launchd_assumes(close(fd) == 0); - free(pending_stdout); - pending_stdout = NULL; - } - } - if (pending_stderr) { - int fd = open(pending_stderr, O_CREAT|O_APPEND|O_WRONLY|O_NOCTTY, DEFFILEMODE); - if (fd != -1) { - launchd_assumes(dup2(fd, STDERR_FILENO) != -1); - launchd_assumes(close(fd) == 0); - free(pending_stderr); - pending_stderr = NULL; - } - } -} - -void launchd_SessionCreate(void) { OSStatus (*sescr)(SessionCreationFlags flags, SessionAttributeBits attributes); @@ -534,17 +504,17 @@ launch_data_t resp = launch_data_new_errno(0); if (launch_data_get_type(o) == LAUNCH_DATA_STRING) { - char **where = &pending_stderr; - - if (d == STDOUT_FILENO) { - where = &pending_stdout; + switch (d) { + case STDOUT_FILENO: + jobmgr_set_stdout(root_jobmgr, launch_data_get_string(o)); + break; + case STDERR_FILENO: + jobmgr_set_stderr(root_jobmgr, launch_data_get_string(o)); + break; + default: + launch_data_set_errno(resp, EINVAL); + break; } - if (*where) { - free(*where); - } - *where = strdup(launch_data_get_string(o)); - } else if (launch_data_get_type(o) == LAUNCH_DATA_FD) { - launchd_assumes(dup2(launch_data_get_fd(o), d) != -1); } else { launch_data_set_errno(resp, EINVAL); } Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-12-04 17:26:23 UTC (rev 22965) +++ trunk/launchd/src/launchd_core_logic.c 2006-12-04 17:34:49 UTC (rev 22966) @@ -3018,6 +3018,26 @@ return true; } +void +jobmgr_set_stdout(jobmgr_t jm, const char *what) +{ + if (jm->jm_stdout) { + free(jm->jm_stdout); + } + + jm->jm_stdout = strdup(what); +} + +void +jobmgr_set_stderr(jobmgr_t jm, const char *what) +{ + if (jm->jm_stderr) { + free(jm->jm_stderr); + } + + jm->jm_stderr = strdup(what); +} + char * jobmgr_get_stdout(jobmgr_t jm) { Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2006-12-04 17:26:23 UTC (rev 22965) +++ trunk/launchd/src/launchd_core_logic.h 2006-12-04 17:34:49 UTC (rev 22966) @@ -29,6 +29,8 @@ extern jobmgr_t root_jobmgr; extern jobmgr_t gc_this_jobmgr; +void jobmgr_set_stdout(jobmgr_t jm, const char *what); +void jobmgr_set_stderr(jobmgr_t jm, const char *what); bool jobmgr_is_idle(jobmgr_t jm); void jobmgr_remove_all_inactive(jobmgr_t jm); void jobmgr_dispatch_all_other_semaphores(jobmgr_t jm, job_t nj);

1 0

[22965] trunk/launchd/src
by source_changes＠macosforge.org 04 Dec '06

04 Dec '06

Revision: 22965 http://trac.macosforge.org/projects/launchd/changeset/22965 Author: zarzycki(a)apple.com Date: 2006-12-04 09:26:23 -0800 (Mon, 04 Dec 2006) Log Message: ----------- <rdar://problem/4857610> 9A318: /etc/launchd.conf forces all servers into user session Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-12-04 17:24:22 UTC (rev 22964) +++ trunk/launchd/src/launchctl.c 2006-12-04 17:26:23 UTC (rev 22965) @@ -1180,6 +1180,11 @@ int hnmib[] = { CTL_KERN, KERN_HOSTNAME }; struct group *tfp_gr; + if (getuid() != 0) { + fprintf(stderr, "%s: Only root can run the 'bootstrap' sub-command right now.\n", getprogname()); + return 1; + } + if (assumes((tfp_gr = getgrnam("procview")) != NULL)) { int tfp_r_mib[3] = { CTL_KERN, KERN_TFP, KERN_TFP_READ_GROUP }; gid_t tfp_r_gid = tfp_gr->gr_gid; Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-12-04 17:24:22 UTC (rev 22964) +++ trunk/launchd/src/launchd.c 2006-12-04 17:26:23 UTC (rev 22965) @@ -106,7 +106,7 @@ static job_t rlcj = NULL; static jmp_buf doom_doom_doom; static void *crash_addr; -static const char *launchctl_bootstrap_tool[] = { "/bin/launchctl", "bootstrap", NULL }; +static const char *launchctl_bootstrap_tool[] = { "/bin/launchctl", /* "bootstrap", */ NULL }; sigset_t blocked_signals = 0; bool shutdown_in_progress = false;

1 0

[22964] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 04 Dec '06

04 Dec '06

Revision: 22964 http://trac.macosforge.org/projects/launchd/changeset/22964 Author: zarzycki(a)apple.com Date: 2006-12-04 09:24:22 -0800 (Mon, 04 Dec 2006) Log Message: ----------- <rdar://problem/4860467> HOME environment variable not set in miniterm when run as loginitem Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-12-04 16:51:34 UTC (rev 22963) +++ trunk/launchd/src/launchd_core_logic.c 2006-12-04 17:24:22 UTC (rev 22964) @@ -1921,6 +1921,7 @@ job_postfork_become_user(job_t j) { char loginname[2000]; + char homedir[PATH_MAX]; struct passwd *pwe; gid_t desired_gid = -1; uid_t desired_uid = -1; @@ -1944,6 +1945,7 @@ } strlcpy(loginname, pwe->pw_name, sizeof(loginname)); + strlcpy(homedir, pwe->pw_dir, sizeof(homedir)); if (pwe->pw_expire && time(NULL) >= pwe->pw_expire) { job_log(j, LOG_ERR, "Expired account"); @@ -1984,6 +1986,8 @@ job_log_error(j, LOG_ERR, "setuid(%u)", desired_uid); _exit(EXIT_FAILURE); } + + setenv("HOME", homedir, 0); } void

1 0

[22963] trunk/launchd/src/launchd.c
by source_changes＠macosforge.org 04 Dec '06

04 Dec '06

Revision: 22963 http://trac.macosforge.org/projects/launchd/changeset/22963 Author: zarzycki(a)apple.com Date: 2006-12-04 08:51:34 -0800 (Mon, 04 Dec 2006) Log Message: ----------- <rdar://problem/4860735> CrashTracer: 6 crashes in launchd at launchd: main + 1672 Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-11-29 22:10:38 UTC (rev 22962) +++ trunk/launchd/src/launchd.c 2006-12-04 16:51:34 UTC (rev 22963) @@ -98,6 +98,7 @@ static bool get_network_state(void); static void monitor_networking_state(void); static void fatal_signal_handler(int sig, siginfo_t *si, void *uap); +static void handle_pid1_crashes_separately(void); static bool re_exec_in_single_user_mode = false; static char *pending_stdout = NULL; @@ -121,7 +122,6 @@ SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 }; - struct sigaction fsa; bool sflag = false, dflag = false, Dflag = false; char ldconf[PATH_MAX] = PID1LAUNCHD_CONF; const char *h = getenv("HOME"); @@ -301,23 +301,35 @@ job_dispatch(fbj, true); } - if (getpid() == 1 && !job_active(rlcj)) { - init_pre_kevent(); + if (getpid() == 1) { + handle_pid1_crashes_separately(); + + if (!job_active(rlcj)) { + init_pre_kevent(); + } } + launchd_runtime(); +} + +void +handle_pid1_crashes_separately(void) +{ + struct sigaction fsa; + switch (setjmp(doom_doom_doom)) { - case SIGILL: - case SIGFPE: - syslog(LOG_EMERG, "We crashed at instruction: %p", crash_addr); - abort(); - case SIGBUS: - case SIGSEGV: - syslog(LOG_EMERG, "We crashed trying to read/write: %p", crash_addr); - abort(); - default: - abort(); - case 0: - break; + case SIGILL: + case SIGFPE: + syslog(LOG_EMERG, "We crashed at instruction: %p", crash_addr); + abort(); + case SIGBUS: + case SIGSEGV: + syslog(LOG_EMERG, "We crashed trying to read/write: %p", crash_addr); + abort(); + default: + abort(); + case 0: + break; } fsa.sa_sigaction = fatal_signal_handler; @@ -328,8 +340,6 @@ launchd_assumes(sigaction(SIGFPE, &fsa, NULL) != -1); launchd_assumes(sigaction(SIGBUS, &fsa, NULL) != -1); launchd_assumes(sigaction(SIGSEGV, &fsa, NULL) != -1); - - launchd_runtime(); } void

1 0