September 2007 - launchd-changes - lists.macosforge.org

[23362] trunk/launchd/src
by source_changes＠macosforge.org 09 Sep '07

09 Sep '07

Revision: 23362 http://trac.macosforge.org/projects/launchd/changeset/23362 Author: zarzycki(a)apple.com Date: 2007-09-09 12:09:56 -0700 (Sun, 09 Sep 2007) Log Message: ----------- Small logging updates. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-08 21:56:28 UTC (rev 23361) +++ trunk/launchd/src/launchd_runtime.c 2007-09-09 19:09:56 UTC (rev 23362) @@ -146,9 +146,6 @@ pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN); launchd_assert(pthread_create(&demand_thread, &attr, mport_demand_loop, NULL) == 0); pthread_attr_destroy(&attr); - - runtime_openlog(getprogname(), LOG_PID|LOG_CONS, LOG_LAUNCHD); - runtime_setlogmask(LOG_UPTO(/* LOG_DEBUG */ LOG_NOTICE)); } void @@ -1027,12 +1024,6 @@ static FILE *ourlogfile; void -runtime_openlog(const char *ident, int logopt, int facility) -{ - openlog(ident, logopt, facility); -} - -void runtime_closelog(void) { if (ourlogfile) { @@ -1051,7 +1042,8 @@ } } -static int internal_mask_pri; +static int internal_mask_pri = LOG_UPTO(LOG_NOTICE); +//static int internal_mask_pri = LOG_UPTO(LOG_DEBUG); int runtime_setlogmask(int maskpri) Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-09-08 21:56:28 UTC (rev 23361) +++ trunk/launchd/src/launchd_runtime.h 2007-09-09 19:09:56 UTC (rev 23362) @@ -77,8 +77,6 @@ pid_t runtime_fork(mach_port_t bsport); -void runtime_openlog(const char *ident, int logopt, int facility); -void runtime_closelog(void); kern_return_t runtime_log_forward(uid_t forward_uid, gid_t forward_gid, vm_offset_t inval, mach_msg_type_number_t invalCnt); kern_return_t runtime_log_drain(mach_port_t srp, vm_offset_t *outval, mach_msg_type_number_t *outvalCnt); @@ -95,6 +93,7 @@ }; int runtime_setlogmask(int maskpri); +void runtime_closelog(void); void runtime_syslog(int pri, const char *message, ...) __attribute__((format(printf, 2, 3))); void runtime_vsyslog(struct runtime_syslog_attr *attr, const char *message, va_list args) __attribute__((format(printf, 2, 0)));

1 0

[23361] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 08 Sep '07

08 Sep '07

Revision: 23361 http://trac.macosforge.org/projects/launchd/changeset/23361 Author: zarzycki(a)apple.com Date: 2007-09-08 14:56:28 -0700 (Sat, 08 Sep 2007) Log Message: ----------- <rdar://problem/5296886> Leopard9A478: machine hung at shutdown with only launchd running Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-07 17:54:58 UTC (rev 23360) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-08 21:56:28 UTC (rev 23361) @@ -4375,6 +4375,9 @@ job_log(ms->job, LOG_DEBUG, "Receive right returned to us: %s", ms->name); job_dispatch(ms->job, false); + + root_jobmgr = jobmgr_do_garbage_collection(root_jobmgr); + return true; }

1 0

[23360] trunk/launchd/src/launchd.plist.5
by source_changes＠macosforge.org 07 Sep '07

07 Sep '07

Revision: 23360 http://trac.macosforge.org/projects/launchd/changeset/23360 Author: zarzycki(a)apple.com Date: 2007-09-07 10:54:58 -0700 (Fri, 07 Sep 2007) Log Message: ----------- <rdar://problem/5425348> GroupName key now ignored when UserName key is not set Modified Paths: -------------- trunk/launchd/src/launchd.plist.5 Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2007-09-06 22:24:34 UTC (rev 23359) +++ trunk/launchd/src/launchd.plist.5 2007-09-07 17:54:58 UTC (rev 23360) @@ -90,6 +90,7 @@ This optional key specifies the user to run the job as. This key is only applicable when launchd is running as root. .It Sy GroupName <string> This optional key specifies the group to run the job as. This key is only applicable when launchd is running as root. If UserName is set and GroupName is not, the the group will be set to the default group of the user. +The GroupName key is ignored without the UserName key. .It Sy inetdCompatibility <dictionary> The presence of this key specifies that the daemon expects to be run as if it were launched from inetd. .Bl -ohang -offset indent @@ -195,7 +196,7 @@ This optional key specifies whether the job should have .Xr initgroups 3 be called before running the job. -The default is false. +The default is true in 10.5 and false in 10.4. This key will be ignored if the UserName key is not set. .It Sy WatchPaths <array of strings> This optional key causes the job to be started if any one of the listed paths are modified. .It Sy QueueDirectories <array of strings>

1 0

[23359] trunk/launchd/src
by source_changes＠macosforge.org 06 Sep '07

06 Sep '07

Revision: 23359 http://trac.macosforge.org/projects/launchd/changeset/23359 Author: zarzycki(a)apple.com Date: 2007-09-06 15:24:34 -0700 (Thu, 06 Sep 2007) Log Message: ----------- Create a wrapper around fsync(). Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-05 21:14:09 UTC (rev 23358) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-06 22:24:34 UTC (rev 23359) @@ -4492,7 +4492,7 @@ } if (logfile_fd != -1) { - job_assumes(j, fcntl(logfile_fd, F_FULLFSYNC, 0) != -1); + job_assumes(j, runtime_fsync(logfile_fd) != -1); job_assumes(j, runtime_close(logfile_fd) != -1); } Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-05 21:14:09 UTC (rev 23358) +++ trunk/launchd/src/launchd_runtime.c 2007-09-06 22:24:34 UTC (rev 23359) @@ -1036,11 +1036,18 @@ runtime_closelog(void) { if (ourlogfile) { - fflush(ourlogfile); + launchd_assumes(fflush(ourlogfile) == 0); + launchd_assumes(runtime_fsync(fileno(ourlogfile)) != -1); + } +} - if (debug_shutdown_hangs) { - fcntl(fileno(ourlogfile), F_FULLFSYNC, NULL); - } +int +runtime_fsync(int fd) +{ + if (debug_shutdown_hangs) { + return fcntl(fd, F_FULLFSYNC, NULL); + } else { + return fsync(fd); } } Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-09-05 21:14:09 UTC (rev 23358) +++ trunk/launchd/src/launchd_runtime.h 2007-09-06 22:24:34 UTC (rev 23359) @@ -61,6 +61,7 @@ void launchd_runtime(void) __attribute__((noreturn)); int runtime_close(int fd); +int runtime_fsync(int fd); void runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to); kern_return_t runtime_add_mport(mach_port_t name, mig_callback demux, mach_msg_size_t msg_size);

1 0

[23358] tags/launchd-241/
by source_changes＠macosforge.org 05 Sep '07

05 Sep '07

Revision: 23358 http://trac.macosforge.org/projects/launchd/changeset/23358 Author: zarzycki(a)apple.com Date: 2007-09-05 14:14:09 -0700 (Wed, 05 Sep 2007) Log Message: ----------- "Tagging launchd-241 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-241/ Copied: tags/launchd-241 (from rev 23357, trunk)

1 0

[23357] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 05 Sep '07

05 Sep '07

Revision: 23357 http://trac.macosforge.org/projects/launchd/changeset/23357 Author: zarzycki(a)apple.com Date: 2007-09-05 13:33:15 -0700 (Wed, 05 Sep 2007) Log Message: ----------- Some help for debugging reboot hangs. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-05 18:20:21 UTC (rev 23356) +++ trunk/launchd/src/launchd_runtime.c 2007-09-05 20:33:15 UTC (rev 23357) @@ -1037,6 +1037,10 @@ { if (ourlogfile) { fflush(ourlogfile); + + if (debug_shutdown_hangs) { + fcntl(fileno(ourlogfile), F_FULLFSYNC, NULL); + } } }

1 0

[23356] trunk/launchd/src
by source_changes＠macosforge.org 05 Sep '07

05 Sep '07

Revision: 23356 http://trac.macosforge.org/projects/launchd/changeset/23356 Author: zarzycki(a)apple.com Date: 2007-09-05 11:20:21 -0700 (Wed, 05 Sep 2007) Log Message: ----------- <rdar://problem/5461936> signal handling bugs found during code audit SIGTERM might be ignored for a tiny window post fork() and pre execve() in the child. SIGTERM might be ignored for a tiny window of launchd's initialization of itself. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-09-05 15:04:36 UTC (rev 23355) +++ trunk/launchd/src/launchd.c 2007-09-05 18:20:21 UTC (rev 23356) @@ -106,13 +106,7 @@ int main(int argc, char *const *argv) { - static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, - SIGTERM, SIGURG, SIGTSTP, SIGTSTP, SIGCONT, SIGTTIN, - SIGTTOU, SIGIO, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, - SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 - }; bool sflag = false; - size_t i; int ch; testfd_or_openfd(STDIN_FILENO, _PATH_DEVNULL, O_RDONLY); @@ -136,10 +130,6 @@ launchd_runtime_init(); - for (i = 0; i < (sizeof(sigigns) / sizeof(int)); i++) { - launchd_assumes(signal(sigigns[i], SIG_IGN) != SIG_ERR); - } - if (NULL == getenv("PATH")) { setenv("PATH", _PATH_STDPATH, 1); } @@ -152,13 +142,14 @@ monitor_networking_state(); - if (getpid() == 1) { handle_pid1_crashes_separately(); } jobmgr_init(sflag); + launchd_runtime_init2(); + launchd_runtime(); } Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-05 15:04:36 UTC (rev 23355) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-05 18:20:21 UTC (rev 23356) @@ -2482,10 +2482,6 @@ job_assumes(j, binpref_out_cnt == j->j_binpref_cnt); } - for (i = 1; i < NSIG; i++) { - signal(i, SIG_DFL); - } - if (j->quarantine_data) { qtn_proc_t qp; Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-05 15:04:36 UTC (rev 23355) +++ trunk/launchd/src/launchd_runtime.c 2007-09-05 18:20:21 UTC (rev 23356) @@ -54,6 +54,7 @@ #include <stdlib.h> #include <stdbool.h> #include <syslog.h> +#include <signal.h> #include <dlfcn.h> #include "launchd_internalServer.h" @@ -105,6 +106,13 @@ static bool logmsg_add(struct runtime_syslog_attr *attr, int err_num, const char *msg); static void logmsg_remove(struct logmsg_s *lm); + +static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM, + SIGURG, SIGTSTP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, + SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 +}; +static sigset_t sigign_set; + void launchd_runtime_init(void) { @@ -143,6 +151,17 @@ runtime_setlogmask(LOG_UPTO(/* LOG_DEBUG */ LOG_NOTICE)); } +void +launchd_runtime_init2(void) +{ + size_t i; + + for (i = 0; i < (sizeof(sigigns) / sizeof(int)); i++) { + sigaddset(&sigign_set, sigigns[i]); + launchd_assumes(signal(sigigns[i], SIG_IGN) != SIG_ERR); + } +} + void * mport_demand_loop(void *arg __attribute__((unused))) { @@ -583,19 +602,33 @@ pid_t runtime_fork(mach_port_t bsport) { + sigset_t emptyset, oset; pid_t r = -1; int saved_errno; + size_t i; + sigemptyset(&emptyset); + launchd_assumes(launchd_mport_make_send(bsport) == KERN_SUCCESS); launchd_assumes(launchd_set_bport(bsport) == KERN_SUCCESS); launchd_assumes(launchd_mport_deallocate(bsport) == KERN_SUCCESS); + launchd_assumes(sigprocmask(SIG_BLOCK, &sigign_set, &oset) != -1); + for (i = 0; i < (sizeof(sigigns) / sizeof(int)); i++) { + launchd_assumes(signal(sigigns[i], SIG_DFL) != SIG_ERR); + } + r = fork(); - saved_errno = errno; if (r != 0) { + for (i = 0; i < (sizeof(sigigns) / sizeof(int)); i++) { + launchd_assumes(signal(sigigns[i], SIG_IGN) != SIG_ERR); + } + launchd_assumes(sigprocmask(SIG_SETMASK, &oset, NULL) != -1); launchd_assumes(launchd_set_bport(MACH_PORT_NULL) == KERN_SUCCESS); + } else { + launchd_assumes(sigprocmask(SIG_SETMASK, &emptyset, NULL) != -1); } errno = saved_errno; Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-09-05 15:04:36 UTC (rev 23355) +++ trunk/launchd/src/launchd_runtime.h 2007-09-05 18:20:21 UTC (rev 23356) @@ -57,6 +57,7 @@ boolean_t launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply); void launchd_runtime_init(void); +void launchd_runtime_init2(void); void launchd_runtime(void) __attribute__((noreturn)); int runtime_close(int fd);

1 0

[23355] trunk/launchd/src/StartupItems.c
by source_changes＠macosforge.org 05 Sep '07

05 Sep '07

Revision: 23355 http://trac.macosforge.org/projects/launchd/changeset/23355 Author: zarzycki(a)apple.com Date: 2007-09-05 08:04:36 -0700 (Wed, 05 Sep 2007) Log Message: ----------- <rdar://problem/5409386> Mac Pro SMC firmware update 1.1 does not begin after restart Modified Paths: -------------- trunk/launchd/src/StartupItems.c Modified: trunk/launchd/src/StartupItems.c =================================================================== --- trunk/launchd/src/StartupItems.c 2007-09-04 23:33:25 UTC (rev 23354) +++ trunk/launchd/src/StartupItems.c 2007-09-05 15:04:36 UTC (rev 23355) @@ -26,6 +26,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/sysctl.h> #include <sys/mman.h> #include <stdlib.h> #include <fcntl.h> @@ -217,15 +218,31 @@ static bool StartupItemSecurityCheck(const char *aPath) { + static struct timeval boot_time; struct stat aStatBuf; bool r = true; + if (boot_time.tv_sec == 0) { + int mib[] = { CTL_KERN, KERN_BOOTTIME }; + size_t boot_time_sz = sizeof(boot_time); + int rv; + + rv = sysctl(mib, sizeof(mib) / sizeof(mib[0]), &boot_time, &boot_time_sz, NULL, 0); + + assert(rv != -1); + assert(boot_time_sz == sizeof(boot_time)); + } + /* should use lstatx_np() on Tiger? */ if (lstat(aPath, &aStatBuf) == -1) { if (errno != ENOENT) syslog(LOG_ERR, "lstat(\"%s\"): %m", aPath); return false; } + if (aStatBuf.st_ctimespec.tv_sec > boot_time.tv_sec) { + syslog(LOG_WARNING, "\"%s\" failed sanity check: path was created after boot up", aPath); + return false; + } if (!(S_ISREG(aStatBuf.st_mode) || S_ISDIR(aStatBuf.st_mode))) { syslog(LOG_WARNING, "\"%s\" failed security check: not a directory or regular file", aPath); r = false;

1 0

[23354] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 04 Sep '07

04 Sep '07

Revision: 23354 http://trac.macosforge.org/projects/launchd/changeset/23354 Author: zarzycki(a)apple.com Date: 2007-09-04 16:33:25 -0700 (Tue, 04 Sep 2007) Log Message: ----------- <rdar://problem/5423935> Investigating: Logged out after waking from sleep Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-04 22:55:10 UTC (rev 23353) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-04 23:33:25 UTC (rev 23354) @@ -2596,8 +2596,11 @@ job_log(j, LOG_ERR, "PID %u \"%s\" has no account to back it! Real/effective/saved UIDs: %u/%u/%u", i_pid, kp[i].kp_proc.p_comm, i_uid, i_euid, i_svuid); +/* Temporarily disabled due to 5423935 and 4946119. */ +#if 0 /* Ask the accountless process to exit. */ job_assumes(j, kill(i_pid, SIGTERM) != -1); +#endif } out:

1 0

[23353] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 04 Sep '07

04 Sep '07

Revision: 23353 http://trac.macosforge.org/projects/launchd/changeset/23353 Author: zarzycki(a)apple.com Date: 2007-09-04 15:55:10 -0700 (Tue, 04 Sep 2007) Log Message: ----------- <rdar://problem/5455720> 9A536: No SMB sharing Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-04 21:23:22 UTC (rev 23352) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-04 22:55:10 UTC (rev 23353) @@ -2033,6 +2033,16 @@ job_start(j); } else { job_watch(j); + + /* + * 5455720 + * + * Path checking and monitoring is really racy right now. + * We should clean this up post Leopard. + */ + if (job_keepalive(j)) { + job_start(j); + } } } else { job_log(j, LOG_DEBUG, "Tried to dispatch an already active job.");

1 0