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

[23038] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 07 Feb '07

07 Feb '07

Revision: 23038 http://trac.macosforge.org/projects/launchd/changeset/23038 Author: zarzycki(a)apple.com Date: 2007-02-07 12:19:36 -0800 (Wed, 07 Feb 2007) Log Message: ----------- posix_spawn() isn't like the rest of the Unix APIs when it comes to errno. 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-02-07 18:26:57 UTC (rev 23037) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-07 20:19:36 UTC (rev 23038) @@ -1933,10 +1933,10 @@ } if (j->prog) { - posix_spawn(&junk_pid, j->inetcompat ? file2exec : j->prog, NULL, &spattr, (char *const*)argv, environ); + errno = posix_spawn(&junk_pid, j->inetcompat ? file2exec : j->prog, NULL, &spattr, (char *const*)argv, environ); job_log_error(j, LOG_ERR, "posix_spawn(\"%s\", ...)", j->prog); } else { - posix_spawnp(&junk_pid, j->inetcompat ? file2exec : argv[0], NULL, &spattr, (char *const*)argv, environ); + errno = posix_spawnp(&junk_pid, j->inetcompat ? file2exec : argv[0], NULL, &spattr, (char *const*)argv, environ); job_log_error(j, LOG_ERR, "posix_spawnp(\"%s\", ...)", argv[0]); }

1 0

[23037] trunk/launchd/src
by source_changes＠macosforge.org 07 Feb '07

07 Feb '07

Revision: 23037 http://trac.macosforge.org/projects/launchd/changeset/23037 Author: zarzycki(a)apple.com Date: 2007-02-07 10:26:57 -0800 (Wed, 07 Feb 2007) Log Message: ----------- <rdar://problem/4941920> job_export_all() crash via launchd's Unix IPC Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-07 17:39:53 UTC (rev 23036) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-07 18:26:57 UTC (rev 23037) @@ -976,9 +976,7 @@ return NULL; } - job_dispatch(j, false); - - return j; + return job_dispatch(j, false); } launch_data_t @@ -1641,19 +1639,19 @@ void jobmgr_dispatch_all(jobmgr_t jm) { - jobmgr_t jmi; - job_t ji; + jobmgr_t jmi, jmn; + job_t ji, jn; - SLIST_FOREACH(jmi, &jm->submgrs, sle) { + SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) { jobmgr_dispatch_all(jmi); } - SLIST_FOREACH(ji, &jm->jobs, sle) { + SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { job_dispatch(ji, false); } } -void +job_t job_dispatch(job_t j, bool kickstart) { /* @@ -1664,15 +1662,18 @@ * * This is a classic example. The act of dispatching a job may delete it. */ - if (job_active(j)) { - return; - } else if (job_useless(j)) { - job_remove(j); - } else if (kickstart || job_keepalive(j)) { - job_start(j); - } else { - job_watch(j); + if (!job_active(j)) { + if (job_useless(j)) { + job_remove(j); + return NULL; + } else if (kickstart || job_keepalive(j)) { + job_start(j); + } else { + job_watch(j); + } } + + return j; } void @@ -3468,6 +3469,7 @@ } } + /* We don't need the _SAFE version because we return after the job_dispatch() */ SLIST_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { if (ms->port != p) { @@ -3613,11 +3615,11 @@ void jobmgr_dispatch_all_semaphores(jobmgr_t jm) { - jobmgr_t jmi; + jobmgr_t jmi, jmn; job_t ji, jn; - SLIST_FOREACH(jmi, &jm->submgrs, sle) { + SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) { jobmgr_dispatch_all_semaphores(jmi); } @@ -3979,10 +3981,12 @@ ms->must_match_uid = true; ms->hide = true; - job_dispatch(ji, false); + ji = job_dispatch(ji, false); } - *up_cont = machservice_port(SLIST_FIRST(&ji->machservices)); + if (job_assumes(j, ji != NULL)) { + *up_cont = machservice_port(SLIST_FIRST(&ji->machservices)); + } return 0; } @@ -4538,8 +4542,12 @@ memcpy(jr->j_binpref, bin_pref, sizeof(jr->j_binpref)); jr->j_binpref_cnt = binpref_cnt; - job_dispatch(jr, true); + jr = job_dispatch(jr, true); + if (!job_assumes(j, jr != NULL)) { + return BOOTSTRAP_NO_MEMORY; + } + if (!job_setup_machport(jr)) { job_remove(jr); return BOOTSTRAP_NO_MEMORY; Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2007-02-07 17:39:53 UTC (rev 23036) +++ trunk/launchd/src/launchd_core_logic.h 2007-02-07 18:26:57 UTC (rev 23037) @@ -43,7 +43,7 @@ launch_data_t job_export_all(void); job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv, const char *stdinpath); -void job_dispatch(job_t j, bool kickstart); +job_t job_dispatch(job_t j, bool kickstart); /* returns j on success, NULL on job removal */ bool job_active(job_t j); launch_data_t job_export(job_t j); void job_stop(job_t j);

1 0

[23036] trunk/launchd/src/StartupItems
by source_changes＠macosforge.org 07 Feb '07

07 Feb '07

Revision: 23036 http://trac.macosforge.org/projects/launchd/changeset/23036 Author: zarzycki(a)apple.com Date: 2007-02-07 09:39:53 -0800 (Wed, 07 Feb 2007) Log Message: ----------- <rdar://problem/4538932> Remove the IPServices StartupItem Removed Paths: ------------- trunk/launchd/src/StartupItems/IPServices trunk/launchd/src/StartupItems/IPServices.plist Deleted: trunk/launchd/src/StartupItems/IPServices =================================================================== --- trunk/launchd/src/StartupItems/IPServices 2007-02-07 16:34:09 UTC (rev 23035) +++ trunk/launchd/src/StartupItems/IPServices 2007-02-07 17:39:53 UTC (rev 23036) @@ -1,30 +0,0 @@ -#!/bin/sh - -## -# IP Services -## - -[ -f /System/Library/LaunchDaemons/com.apache.httpd.plist ] && exit 0 - -. /etc/rc.common - -StartService () -{ - if [ -a /etc/com.apple.named.conf.proxy ] - then - echo "Starting Internet address sharing" - /usr/libexec/InternetSharing - fi -} - -StopService () -{ - return 0 -} - -RestartService () -{ - return 0 -} - -RunService "$1" Deleted: trunk/launchd/src/StartupItems/IPServices.plist =================================================================== --- trunk/launchd/src/StartupItems/IPServices.plist 2007-02-07 16:34:09 UTC (rev 23035) +++ trunk/launchd/src/StartupItems/IPServices.plist 2007-02-07 17:39:53 UTC (rev 23036) @@ -1,5 +0,0 @@ -{ - Description = "Internet services"; - Provides = ("Super Server", "Config Server"); - Uses = ("mDNSResponder", "Portmap"); -}

1 0

[23035] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 07 Feb '07

07 Feb '07

Revision: 23035 http://trac.macosforge.org/projects/launchd/changeset/23035 Author: zarzycki(a)apple.com Date: 2007-02-07 08:34:09 -0800 (Wed, 07 Feb 2007) Log Message: ----------- <rdar://problem/4968241> spurious logging from the libraries used by the various importers 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-02-06 22:10:42 UTC (rev 23034) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-07 16:34:09 UTC (rev 23035) @@ -1803,7 +1803,7 @@ job_assumes(j, socketpair(AF_UNIX, SOCK_STREAM, 0, execspair) != -1); - if (job_assumes(j, pipe(oepair) != -1)) { + if (!j->legacy_mach_job && job_assumes(j, pipe(oepair) != -1)) { j->log_redirect_fd = _fd(oepair[0]); job_assumes(j, fcntl(j->log_redirect_fd, F_SETFL, O_NONBLOCK) != -1); job_assumes(j, kevent_mod(j->log_redirect_fd, EVFILT_READ, EV_ADD, 0, 0, j) != -1); @@ -1822,9 +1822,11 @@ } break; case 0: - job_assumes(j, dup2(oepair[1], STDOUT_FILENO) != -1); - job_assumes(j, dup2(oepair[1], STDERR_FILENO) != -1); - job_assumes(j, close(oepair[1]) != -1); + if (!j->legacy_mach_job) { + job_assumes(j, dup2(oepair[1], STDOUT_FILENO) != -1); + job_assumes(j, dup2(oepair[1], STDERR_FILENO) != -1); + job_assumes(j, close(oepair[1]) != -1); + } job_assumes(j, close(execspair[0]) == 0); /* wait for our parent to say they've attached a kevent to us */ read(_fd(execspair[1]), &c, sizeof(c)); @@ -1845,7 +1847,9 @@ job_start_child(j); break; default: - job_assumes(j, close(oepair[1]) != -1); + if (!j->legacy_mach_job) { + job_assumes(j, close(oepair[1]) != -1); + } j->p = c; j->forkfd = _fd(execspair[0]); job_assumes(j, close(execspair[1]) == 0);

1 0

[23034] tags/launchd-192/
by source_changes＠macosforge.org 06 Feb '07

06 Feb '07

Revision: 23034 http://trac.macosforge.org/projects/launchd/changeset/23034 Author: zarzycki(a)apple.com Date: 2007-02-06 14:10:42 -0800 (Tue, 06 Feb 2007) Log Message: ----------- "Tagging launchd-192 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-192/ Copied: tags/launchd-192 (from rev 23033, trunk)

1 0

[23033] trunk/launchd/src/launchd.plist.5
by source_changes＠macosforge.org 06 Feb '07

06 Feb '07

Revision: 23033 http://trac.macosforge.org/projects/launchd/changeset/23033 Author: zarzycki(a)apple.com Date: 2007-02-06 14:09:40 -0800 (Tue, 06 Feb 2007) Log Message: ----------- <rdar://problem/4979569> Errors in "man launchd.plist" Modified Paths: -------------- trunk/launchd/src/launchd.plist.5 Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2007-02-06 19:16:25 UTC (rev 23032) +++ trunk/launchd/src/launchd.plist.5 2007-02-06 22:09:40 UTC (rev 23033) @@ -180,7 +180,7 @@ This key lets one override the default throttling policy imposed on jobs by .Nm launchd . The value is in seconds, and by default, jobs will not be spawned more than once every 10 seconds. -The principle behind this is that jobs should linger around just in case their needed again in the near future. This not only +The principle behind this is that jobs should linger around just in case they are needed again in the near future. This not only reduces the latency of responses, but it encourages developers to amortize the cost of program invocation. .It Sy InitGroups <boolean> This optional key specifies whether the job should have

1 0

[23032] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 06 Feb '07

06 Feb '07

Revision: 23032 http://trac.macosforge.org/projects/launchd/changeset/23032 Author: zarzycki(a)apple.com Date: 2007-02-06 11:16:25 -0800 (Tue, 06 Feb 2007) Log Message: ----------- I just got off the phone with our dynamic linker engineer. This should work just as well, but with less code. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-02-06 17:50:05 UTC (rev 23031) +++ trunk/launchd/src/launchd_runtime.c 2007-02-06 19:16:25 UTC (rev 23032) @@ -34,7 +34,6 @@ #include <mach/host_info.h> #include <mach/mach_host.h> #include <mach/exception.h> -#include <mach-o/dyld.h> #include <sys/types.h> #include <sys/time.h> #include <sys/event.h> @@ -51,6 +50,7 @@ #include <stdlib.h> #include <stdbool.h> #include <syslog.h> +#include <dlfcn.h> #include "launchd_internalServer.h" #include "launchd_internal.h" @@ -192,47 +192,18 @@ return NULL; } -static bool -ptr_is_in_exe(void *ptr) -{ - uint32_t i, count = _dyld_image_count(); - - for (i = 0; i < count; i++) { - const struct mach_header *header = _dyld_get_image_header(i); - uint32_t j, offset = _dyld_get_image_vmaddr_slide(i); - struct segment_command *seg; - struct load_command *cmd; - - j = 0; - cmd = (struct load_command*)((char *)header + sizeof(struct mach_header)); - - while (j < header->ncmds) { - if (cmd->cmd == LC_SEGMENT) { - seg = (struct segment_command*)cmd; - if (((uint32_t)ptr >= (seg->vmaddr + offset)) && ((uint32_t)ptr < (seg->vmaddr + offset + seg->vmsize))) { - return true; - } - } - - j++; - cmd = (struct load_command*)((char*)cmd + cmd->cmdsize); - } - } - - return false; -} - kern_return_t x_handle_kqueue(mach_port_t junk __attribute__((unused)), integer_t fd) { struct timespec ts = { 0, 0 }; struct kevent kev; + Dl_info dli; int kevr; launchd_assumes((kevr = kevent(fd, NULL, 0, &kev, 1, &ts)) != -1); if (kevr == 1) { - if (launchd_assumes(malloc_size(kev.udata) || ptr_is_in_exe(kev.udata))) { + if (launchd_assumes(malloc_size(kev.udata) || dladdr(kev.udata, &dli))) { (*((kq_callback *)kev.udata))(kev.udata, &kev); } else { syslog(LOG_ERR, "kev.ident == 0x%x kev.filter == 0x%x kev.fflags = 0x%x kev.udata = 0x%x",

1 0

[23031] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 06 Feb '07

06 Feb '07

Revision: 23031 http://trac.macosforge.org/projects/launchd/changeset/23031 Author: zarzycki(a)apple.com Date: 2007-02-06 09:50:05 -0800 (Tue, 06 Feb 2007) Log Message: ----------- <rdar://problem/4978693> Code to help track down an elusive crash Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-02-05 22:11:46 UTC (rev 23030) +++ trunk/launchd/src/launchd_runtime.c 2007-02-06 17:50:05 UTC (rev 23031) @@ -34,12 +34,14 @@ #include <mach/host_info.h> #include <mach/mach_host.h> #include <mach/exception.h> +#include <mach-o/dyld.h> #include <sys/types.h> #include <sys/time.h> #include <sys/event.h> #include <sys/queue.h> #include <sys/socket.h> #include <bsm/libbsm.h> +#include <malloc/malloc.h> #include <unistd.h> #include <pthread.h> #include <errno.h> @@ -190,6 +192,36 @@ return NULL; } +static bool +ptr_is_in_exe(void *ptr) +{ + uint32_t i, count = _dyld_image_count(); + + for (i = 0; i < count; i++) { + const struct mach_header *header = _dyld_get_image_header(i); + uint32_t j, offset = _dyld_get_image_vmaddr_slide(i); + struct segment_command *seg; + struct load_command *cmd; + + j = 0; + cmd = (struct load_command*)((char *)header + sizeof(struct mach_header)); + + while (j < header->ncmds) { + if (cmd->cmd == LC_SEGMENT) { + seg = (struct segment_command*)cmd; + if (((uint32_t)ptr >= (seg->vmaddr + offset)) && ((uint32_t)ptr < (seg->vmaddr + offset + seg->vmsize))) { + return true; + } + } + + j++; + cmd = (struct load_command*)((char*)cmd + cmd->cmdsize); + } + } + + return false; +} + kern_return_t x_handle_kqueue(mach_port_t junk __attribute__((unused)), integer_t fd) { @@ -200,7 +232,12 @@ launchd_assumes((kevr = kevent(fd, NULL, 0, &kev, 1, &ts)) != -1); if (kevr == 1) { - (*((kq_callback *)kev.udata))(kev.udata, &kev); + if (launchd_assumes(malloc_size(kev.udata) || ptr_is_in_exe(kev.udata))) { + (*((kq_callback *)kev.udata))(kev.udata, &kev); + } else { + syslog(LOG_ERR, "kev.ident == 0x%x kev.filter == 0x%x kev.fflags = 0x%x kev.udata = 0x%x", + kev.ident, kev.filter, kev.fflags, kev.udata); + } } launchd_post_kevent();

1 0

[23030] trunk/launchd/src/com.apple.SystemStarter.plist
by source_changes＠macosforge.org 05 Feb '07

05 Feb '07

Revision: 23030 http://trac.macosforge.org/projects/launchd/changeset/23030 Author: zarzycki(a)apple.com Date: 2007-02-05 14:11:46 -0800 (Mon, 05 Feb 2007) Log Message: ----------- <rdar://problem/4976905> turn SystemStarter into a launchd job Added Paths: ----------- trunk/launchd/src/com.apple.SystemStarter.plist Added: trunk/launchd/src/com.apple.SystemStarter.plist =================================================================== --- trunk/launchd/src/com.apple.SystemStarter.plist (rev 0) +++ trunk/launchd/src/com.apple.SystemStarter.plist 2007-02-05 22:11:46 UTC (rev 23030) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>Label</key> + <string>com.apple.SystemStarter</string> + <key>Program</key> + <string>/sbin/SystemStarter</string> + <key>RunAtLoad</key> + <true/> +</dict> +</plist>

1 0

[23029] trunk/launchd/src
by source_changes＠macosforge.org 05 Feb '07

05 Feb '07

Revision: 23029 http://trac.macosforge.org/projects/launchd/changeset/23029 Author: zarzycki(a)apple.com Date: 2007-02-05 14:11:16 -0800 (Mon, 05 Feb 2007) Log Message: ----------- <rdar://problem/4976905> turn SystemStarter into a launchd job Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in trunk/launchd/src/SystemStarter.c trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2007-02-05 21:35:42 UTC (rev 23028) +++ trunk/launchd/src/Makefile.am 2007-02-05 22:11:16 UTC (rev 23029) @@ -93,7 +93,8 @@ mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d mkdir -p $(DESTDIR)/Library/LaunchDaemons mkdir -p $(DESTDIR)/Library/LaunchAgents + mkdir -p $(DESTDIR)/System/Library/LaunchAgents mkdir -p $(DESTDIR)/System/Library/LaunchDaemons - mkdir -p $(DESTDIR)/System/Library/LaunchAgents + cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons endif Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2007-02-05 21:35:42 UTC (rev 23028) +++ trunk/launchd/src/Makefile.in 2007-02-05 22:11:16 UTC (rev 23029) @@ -1107,8 +1107,9 @@ @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchDaemons @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchAgents +@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchAgents @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchDaemons -@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchAgents +@LIBS_ONLY_FALSE@ cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Modified: trunk/launchd/src/SystemStarter.c =================================================================== --- trunk/launchd/src/SystemStarter.c 2007-02-05 21:35:42 UTC (rev 23028) +++ trunk/launchd/src/SystemStarter.c 2007-02-05 22:11:16 UTC (rev 23029) @@ -22,6 +22,9 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ **/ +#include <sys/types.h> +#include <sys/stat.h> +#include <paths.h> #include <unistd.h> #include <crt_externs.h> #include <fcntl.h> @@ -147,7 +150,27 @@ } } - exit(system_starter(anAction, aService)); + int ssec = system_starter(anAction, aService); + struct stat sb; + + if (anAction == kActionStart && stat("/etc/rc.local", &sb) != -1) { + int wstatus; + pid_t rclp; + + switch ((rclp = fork())) { + case -1: + break; + case 0: + execlp(_PATH_BSHELL, _PATH_BSHELL, "/etc/rc.local", NULL); + _exit(EXIT_FAILURE); + break; + default: + waitpid(rclp, &wstatus, 0); + break; + } + } + + exit(ssec); } Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-02-05 21:35:42 UTC (rev 23028) +++ trunk/launchd/src/launchctl.c 2007-02-05 22:11:16 UTC (rev 23029) @@ -1274,14 +1274,6 @@ _vproc_set_global_on_demand(false); - const char *SystemStarter_tool[] = { "SystemStarter", NULL }; - assumes(fwexec(SystemStarter_tool, false) != -1); - - if (path_check("/etc/rc.local")) { - const char *rc_local_tool[] = { _PATH_BSHELL, "/etc/rc.local", NULL }; - assumes(fwexec(rc_local_tool, true) != -1); - } - return 0; }

1 0