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

[23313] trunk/launchd/src
by source_changes＠macosforge.org 16 Jul '07

16 Jul '07

Revision: 23313 http://trac.macosforge.org/projects/launchd/changeset/23313 Author: zarzycki(a)apple.com Date: 2007-07-16 10:21:16 -0700 (Mon, 16 Jul 2007) Log Message: ----------- <rdar://problem/5334227> launchd-shutdown.log lost most of its informative value Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-07-16 16:54:29 UTC (rev 23312) +++ trunk/launchd/src/launchd.c 2007-07-16 17:21:16 UTC (rev 23313) @@ -262,6 +262,7 @@ * When this changes to a more sustainable API, update this: * http://howto.apple.com/db.cgi?Debugging_Apps_Non-Responsive_At_Shutdown */ + runtime_setlogmask(LOG_UPTO(LOG_DEBUG)); prep_shutdown_log_dir(); debug_shutdown_hangs = true; } Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-07-16 16:54:29 UTC (rev 23312) +++ trunk/launchd/src/launchd_runtime.c 2007-07-16 17:21:16 UTC (rev 23313) @@ -1084,9 +1084,11 @@ prev_msg = tvnow; - snprintf(newmsg, sizeof(newmsg), "%3ld.%06d\t%ld.%06d\t", + snprintf(newmsg, sizeof(newmsg), "%3ld.%06d%4ld.%06d%6u %-40s%6u %-40s ", tvd_total.tv_sec, tvd_total.tv_usec, - tvd_msg_delta.tv_sec, tvd_msg_delta.tv_usec); + tvd_msg_delta.tv_sec, tvd_msg_delta.tv_usec, + attr->from_pid, attr->from_name, + attr->about_pid, attr->about_name); for (i = 0, j = strlen(newmsg); message[i];) { if (message[i] == '%' && message[i + 1] == 'm') {

1 0

[23312] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 16 Jul '07

16 Jul '07

Revision: 23312 http://trac.macosforge.org/projects/launchd/changeset/23312 Author: zarzycki(a)apple.com Date: 2007-07-16 09:54:29 -0700 (Mon, 16 Jul 2007) Log Message: ----------- <rdar://problem/5334775> launchctl needs to target root boostrap when run as root Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-07-16 16:46:32 UTC (rev 23311) +++ trunk/launchd/src/launchctl.c 2007-07-16 16:54:29 UTC (rev 23312) @@ -216,8 +216,16 @@ int main(int argc, char *const argv[]) { + int64_t is_managed = 0; char *l; + if ((getuid() == 0) && (vproc_swap_integer(NULL, VPROC_GSK_IS_MANAGED, NULL, &is_managed) == NULL) && (is_managed == 0)) { + mach_port_t root_bs = str2bsport("/"); + task_set_bootstrap_port(mach_task_self(), root_bs); + mach_port_deallocate(mach_task_self(), bootstrap_port); + bootstrap_port = root_bs; + } + istty = isatty(STDIN_FILENO); argc--, argv++;

1 0

[23311] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 16 Jul '07

16 Jul '07

Revision: 23311 http://trac.macosforge.org/projects/launchd/changeset/23311 Author: zarzycki(a)apple.com Date: 2007-07-16 09:46:32 -0700 (Mon, 16 Jul 2007) Log Message: ----------- <rdar://problem/5337302> Bug: launchctl.c:452 (23304):25: _vproc_send_signal_by_label(launch_data_get_string(tmps), VPROC_MAGIC_UNLOAD_SIGNAL) == NULL Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-07-16 15:47:31 UTC (rev 23310) +++ trunk/launchd/src/launchctl.c 2007-07-16 16:46:32 UTC (rev 23311) @@ -451,7 +451,9 @@ return; } - assumes(_vproc_send_signal_by_label(launch_data_get_string(tmps), VPROC_MAGIC_UNLOAD_SIGNAL) == NULL); + if (_vproc_send_signal_by_label(launch_data_get_string(tmps), VPROC_MAGIC_UNLOAD_SIGNAL) != NULL) { + fprintf(stderr, "%s: Error unloading: %s\n", getprogname(), launch_data_get_string(tmps)); + } } launch_data_t

1 0

[23310] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Jul '07

16 Jul '07

Revision: 23310 http://trac.macosforge.org/projects/launchd/changeset/23310 Author: zarzycki(a)apple.com Date: 2007-07-16 08:47:31 -0700 (Mon, 16 Jul 2007) Log Message: ----------- clarity++ 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-07-12 23:00:49 UTC (rev 23309) +++ trunk/launchd/src/launchd_core_logic.c 2007-07-16 15:47:31 UTC (rev 23310) @@ -2607,6 +2607,17 @@ return; } + /* + * We must copy the results of getpw*(). + * + * Why? Because subsequent API calls may call getpw*() as a part of + * their implementation. Since getpw*() returns a [now thread scoped] + * global, we must therefore cache the results before continuing. + */ + + desired_uid = pwe->pw_uid; + desired_gid = pwe->pw_gid; + strlcpy(shellpath, pwe->pw_shell, sizeof(shellpath)); strlcpy(loginname, pwe->pw_name, sizeof(loginname)); strlcpy(homedir, pwe->pw_dir, sizeof(homedir)); @@ -2616,8 +2627,6 @@ _exit(EXIT_FAILURE); } - desired_uid = pwe->pw_uid; - desired_gid = pwe->pw_gid; if (j->username && strcmp(j->username, loginname) != 0) { job_log(j, LOG_WARNING, "Suspicious setup: User \"%s\" maps to user: %s", j->username, loginname);

1 0

[23309] tags/launchd-229/
by source_changes＠macosforge.org 12 Jul '07

12 Jul '07

Revision: 23309 http://trac.macosforge.org/projects/launchd/changeset/23309 Author: zarzycki(a)apple.com Date: 2007-07-12 16:00:49 -0700 (Thu, 12 Jul 2007) Log Message: ----------- "Tagging launchd-229 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-229/ Copied: tags/launchd-229 (from rev 23308, trunk)

1 0

[23308] trunk/launchd/src
by source_changes＠macosforge.org 12 Jul '07

12 Jul '07

Revision: 23308 http://trac.macosforge.org/projects/launchd/changeset/23308 Author: zarzycki(a)apple.com Date: 2007-07-12 13:43:08 -0700 (Thu, 12 Jul 2007) Log Message: ----------- <rdar://problem/5326137> launchd dynamic enable/disable of services based on machine Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/liblaunch_public.h Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-07-12 20:05:47 UTC (rev 23307) +++ trunk/launchd/src/launchctl.c 2007-07-12 20:43:08 UTC (rev 23308) @@ -20,6 +20,13 @@ static const char *const __rcs_file_version__ = "$Revision$"; +#include "liblaunch_public.h" +#include "liblaunch_private.h" +#include "libbootstrap_public.h" +#include "libvproc_public.h" +#include "libvproc_private.h" +#include "libvproc_internal.h" + #include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CFPriv.h> #include <Security/Security.h> @@ -65,12 +72,6 @@ #include <sysexits.h> #include <util.h> -#include "libbootstrap_public.h" -#include "libvproc_public.h" -#include "libvproc_private.h" -#include "libvproc_internal.h" -#include "liblaunch_public.h" -#include "liblaunch_private.h" #define LAUNCH_SECDIR "/tmp/launch-XXXXXX" @@ -143,6 +144,7 @@ static void do_single_user_mode(bool); static bool do_single_user_mode2(void); static void read_launchd_conf(void); +static bool job_disabled_logic(launch_data_t obj); typedef enum { BOOTCACHE_START = 1, @@ -612,7 +614,7 @@ } if ((tmpd = launch_data_dict_lookup(thejob, LAUNCH_JOBKEY_DISABLED))) { - job_disabled = launch_data_get_bool(tmpd); + job_disabled = job_disabled_logic(tmpd); } if (lus->forceload) { @@ -641,7 +643,62 @@ launch_data_free(thejob); } +static bool +sysctl_hw_streq(int mib_slot, const char *str) +{ + char buf[1000]; + size_t bufsz = sizeof(buf); + int mib[] = { CTL_HW, mib_slot }; + + if (sysctl(mib, 2, buf, &bufsz, NULL, 0) != -1) { + if (strcmp(buf, str) == 0) { + return true; + } + } + + return false; +} + +static void +job_disabled_dict_logic(launch_data_t obj, const char *key, void *context) +{ + bool *r = context; + + if (launch_data_get_type(obj) != LAUNCH_DATA_STRING) { + return; + } + + if (strcasecmp(key, LAUNCH_JOBKEY_DISABLED_MACHINETYPE) == 0) { + if (sysctl_hw_streq(HW_MACHINE, launch_data_get_string(obj))) { + *r = true; + } + } else if (strcasecmp(key, LAUNCH_JOBKEY_DISABLED_MODELNAME) == 0) { + if (sysctl_hw_streq(HW_MODEL, launch_data_get_string(obj))) { + *r = true; + } + } +} + bool +job_disabled_logic(launch_data_t obj) +{ + bool r = false; + + switch (launch_data_get_type(obj)) { + case LAUNCH_DATA_DICTIONARY: + launch_data_dict_iterate(obj, job_disabled_dict_logic, &r); + break; + case LAUNCH_DATA_BOOL: + r = launch_data_get_bool(obj); + break; + default: + break; + } + + return r; +} + +bool path_goodness_check(const char *path, bool forceload) { struct stat sb; Modified: trunk/launchd/src/liblaunch_public.h =================================================================== --- trunk/launchd/src/liblaunch_public.h 2007-07-12 20:05:47 UTC (rev 23307) +++ trunk/launchd/src/liblaunch_public.h 2007-07-12 20:43:08 UTC (rev 23308) @@ -126,6 +126,9 @@ #define LAUNCH_JOBKEY_RESOURCELIMIT_RSS "ResidentSetSize" #define LAUNCH_JOBKEY_RESOURCELIMIT_STACK "Stack" +#define LAUNCH_JOBKEY_DISABLED_MACHINETYPE "MachineType" +#define LAUNCH_JOBKEY_DISABLED_MODELNAME "ModelName" + #define LAUNCH_JOBSOCKETKEY_TYPE "SockType" #define LAUNCH_JOBSOCKETKEY_PASSIVE "SockPassive" #define LAUNCH_JOBSOCKETKEY_BONJOUR "Bonjour"

1 0

[23307] trunk/launchd/src/libvproc.c
by source_changes＠macosforge.org 12 Jul '07

12 Jul '07

Revision: 23307 http://trac.macosforge.org/projects/launchd/changeset/23307 Author: zarzycki(a)apple.com Date: 2007-07-12 13:05:47 -0700 (Thu, 12 Jul 2007) Log Message: ----------- <rdar://problem/5328938> 9A491: syslogd crashed 12 times in _vprocmgr_log_drain Modified Paths: -------------- trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2007-07-11 23:16:02 UTC (rev 23306) +++ trunk/launchd/src/libvproc.c 2007-07-12 20:05:47 UTC (rev 23307) @@ -395,7 +395,7 @@ vproc_err_t _vprocmgr_log_drain(vproc_t vp __attribute__((unused)), pthread_mutex_t *mutex, _vprocmgr_log_drain_callback_t func) { - mach_msg_type_number_t outdata_cnt; + mach_msg_type_number_t outdata_cnt, tmp_cnt; vm_offset_t outdata = 0; struct logmsg_s *lm; @@ -407,17 +407,22 @@ return _vprocmgr_log_drain; } + tmp_cnt = outdata_cnt; + if (mutex) { pthread_mutex_lock(mutex); } - for (lm = (struct logmsg_s *)outdata; lm->obj_sz; lm = ((void *)lm + lm->obj_sz)) { + for (lm = (struct logmsg_s *)outdata; tmp_cnt > 0; lm = ((void *)lm + lm->obj_sz)) { lm->from_name += (size_t)lm; lm->about_name += (size_t)lm; lm->msg += (size_t)lm; lm->session_name += (size_t)lm; - func(&lm->when, lm->from_pid, lm->about_pid, lm->sender_uid, lm->sender_gid, lm->pri, lm->from_name, lm->about_name, lm->session_name, lm->msg); + func(&lm->when, lm->from_pid, lm->about_pid, lm->sender_uid, lm->sender_gid, lm->pri, + lm->from_name, lm->about_name, lm->session_name, lm->msg); + + tmp_cnt -= lm->obj_sz; } if (mutex) {

1 0

[23306] tags/launchd-228/
by source_changes＠macosforge.org 11 Jul '07

11 Jul '07

Revision: 23306 http://trac.macosforge.org/projects/launchd/changeset/23306 Author: zarzycki(a)apple.com Date: 2007-07-11 16:16:02 -0700 (Wed, 11 Jul 2007) Log Message: ----------- "Tagging launchd-228 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-228/ Copied: tags/launchd-228 (from rev 23305, trunk)

1 0

[23305] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 11 Jul '07

11 Jul '07

Revision: 23305 http://trac.macosforge.org/projects/launchd/changeset/23305 Author: zarzycki(a)apple.com Date: 2007-07-11 15:29:16 -0700 (Wed, 11 Jul 2007) Log Message: ----------- <rdar://problem/5328364> Leopard9A491: After Installing 9A491 the system froze at restart in the installer. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-07-11 22:11:37 UTC (rev 23304) +++ trunk/launchd/src/launchd_runtime.c 2007-07-11 22:29:16 UTC (rev 23305) @@ -1195,6 +1195,7 @@ runtime_log_uncork_pending_drain(void) { mach_msg_type_number_t outvalCnt; + mach_port_t tmp_port; vm_offset_t outval; if (!drain_reply_port) { @@ -1209,12 +1210,13 @@ return; } - if (!launchd_assumes(job_mig_log_drain_reply(drain_reply_port, 0, outval, outvalCnt) == 0)) { - launchd_assumes(launchd_mport_deallocate(drain_reply_port) == KERN_SUCCESS); + tmp_port = drain_reply_port; + drain_reply_port = MACH_PORT_NULL; + + if (!launchd_assumes(job_mig_log_drain_reply(tmp_port, 0, outval, outvalCnt) == 0)) { + launchd_assumes(launchd_mport_deallocate(tmp_port) == KERN_SUCCESS); } - drain_reply_port = MACH_PORT_NULL; - mig_deallocate(outval, outvalCnt); }

1 0

[23304] trunk/launchd/src
by source_changes＠macosforge.org 11 Jul '07

11 Jul '07

Revision: 23304 http://trac.macosforge.org/projects/launchd/changeset/23304 Author: zarzycki(a)apple.com Date: 2007-07-11 15:11:37 -0700 (Wed, 11 Jul 2007) Log Message: ----------- <rdar://problem/5194957> launchctl unload should block until unload is complete Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libvproc_private.h trunk/launchd/src/protocol_job.defs trunk/launchd/src/protocol_job_reply.defs Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-07-11 18:10:33 UTC (rev 23303) +++ trunk/launchd/src/launchctl.c 2007-07-11 22:11:37 UTC (rev 23304) @@ -440,11 +440,8 @@ void unloadjob(launch_data_t job) { - launch_data_t resp, tmp, tmps, msg; - int e; + launch_data_t tmps; - msg = launch_data_alloc(LAUNCH_DATA_DICTIONARY); - tmp = launch_data_alloc(LAUNCH_DATA_STRING); tmps = launch_data_dict_lookup(job, LAUNCH_JOBKEY_LABEL); if (!tmps) { @@ -452,20 +449,7 @@ return; } - launch_data_set_string(tmp, launch_data_get_string(tmps)); - launch_data_dict_insert(msg, tmp, LAUNCH_KEY_REMOVEJOB); - resp = launch_msg(msg); - launch_data_free(msg); - if (!resp) { - fprintf(stderr, "%s: Error: launch_msg(): %s\n", getprogname(), strerror(errno)); - return; - } - if (LAUNCH_DATA_ERRNO == launch_data_get_type(resp)) { - if ((e = launch_data_get_errno(resp))) { - fprintf(stderr, "%s\n", strerror(e)); - } - } - launch_data_free(resp); + assumes(_vproc_send_signal_by_label(launch_data_get_string(tmps), VPROC_MAGIC_UNLOAD_SIGNAL) == NULL); } launch_data_t Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-07-11 18:10:33 UTC (rev 23303) +++ trunk/launchd/src/launchd_core_logic.c 2007-07-11 22:11:37 UTC (rev 23304) @@ -105,8 +105,14 @@ extern char **environ; -mach_port_t inherited_bootstrap_port; +struct waiting_for_removal { + SLIST_ENTRY(waiting_for_removal) sle; + mach_port_t reply_port; +}; +static bool waiting4removal_new(job_t j, mach_port_t rp); +static void waiting4removal_delete(job_t j, struct waiting_for_removal *w4r); + struct mspolicy { SLIST_ENTRY(mspolicy) sle; unsigned int allow:1, per_pid:1; @@ -308,6 +314,7 @@ SLIST_HEAD(, mspolicy) mspolicies; SLIST_HEAD(, machservice) machservices; SLIST_HEAD(, semaphoreitem) semaphores; + SLIST_HEAD(, waiting_for_removal) removal_watchers; #if DO_RUSAGE_SUMMATION struct rusage ru; #endif @@ -447,6 +454,7 @@ static jobmgr_t background_jobmgr; /* process wide globals */ +mach_port_t inherited_bootstrap_port; jobmgr_t root_jobmgr; void @@ -711,6 +719,7 @@ void job_remove(job_t j) { + struct waiting_for_removal *w4r; struct calendarinterval *ci; struct semaphoreitem *si; struct socketgroup *sg; @@ -778,6 +787,9 @@ while ((si = SLIST_FIRST(&j->semaphores))) { semaphoreitem_delete(j, si); } + while ((w4r = SLIST_FIRST(&j->removal_watchers))) { + waiting4removal_delete(j, w4r); + } if (j->prog) { free(j->prog); @@ -4769,7 +4781,7 @@ } kern_return_t -job_mig_send_signal(job_t j, name_t targetlabel, int sig) +job_mig_send_signal(job_t j, mach_port_t srp, name_t targetlabel, int sig) { struct ldcred ldc; job_t otherj; @@ -4788,7 +4800,24 @@ return BOOTSTRAP_UNKNOWN_SERVICE; } - if (otherj->p) { + if (sig == VPROC_MAGIC_UNLOAD_SIGNAL) { + bool do_block = otherj->p; + + if (otherj->anonymous) { + return BOOTSTRAP_NOT_PRIVILEGED; + } + + job_remove(otherj); + + if (do_block) { + job_log(j, LOG_DEBUG, "Blocking MIG return of job_remove(): %s", otherj->label); + /* this is messy. We shouldn't access 'otherj' after job_remove(), but we check otherj->p first... */ + job_assumes(otherj, waiting4removal_new(otherj, srp)); + return MIG_NO_REPLY; + } else { + return 0; + } + } else if (otherj->p) { job_assumes(j, kill(otherj->p, sig) != -1); } @@ -6134,3 +6163,29 @@ free(msp); } + +bool +waiting4removal_new(job_t j, mach_port_t rp) +{ + struct waiting_for_removal *w4r; + + if (!job_assumes(j, (w4r = malloc(sizeof(struct waiting_for_removal))) != NULL)) { + return false; + } + + w4r->reply_port = rp; + + SLIST_INSERT_HEAD(&j->removal_watchers, w4r, sle); + + return true; +} + +void +waiting4removal_delete(job_t j, struct waiting_for_removal *w4r) +{ + job_assumes(j, job_mig_send_signal_reply(w4r->reply_port, 0) == 0); + + SLIST_REMOVE(&j->removal_watchers, w4r, waiting_for_removal, sle); + + free(w4r); +} Modified: trunk/launchd/src/libvproc_private.h =================================================================== --- trunk/launchd/src/libvproc_private.h 2007-07-11 18:10:33 UTC (rev 23303) +++ trunk/launchd/src/libvproc_private.h 2007-07-11 22:11:37 UTC (rev 23304) @@ -31,6 +31,9 @@ #pragma GCC visibility push(default) +/* DO NOT use this. This is a hack for launchctl */ +#define VPROC_MAGIC_UNLOAD_SIGNAL 0x4141504C + typedef enum { VPROC_GSK_LAST_EXIT_STATUS = 1, VPROC_GSK_GLOBAL_ON_DEMAND, Modified: trunk/launchd/src/protocol_job.defs =================================================================== --- trunk/launchd/src/protocol_job.defs 2007-07-11 18:10:33 UTC (rev 23303) +++ trunk/launchd/src/protocol_job.defs 2007-07-11 22:11:37 UTC (rev 23304) @@ -70,6 +70,7 @@ routine send_signal( __bs_port : job_t; + sreplyport __rport : mach_port_make_send_once_t; __label : name_t; __signal : integer_t); Modified: trunk/launchd/src/protocol_job_reply.defs =================================================================== --- trunk/launchd/src/protocol_job_reply.defs 2007-07-11 18:10:33 UTC (rev 23303) +++ trunk/launchd/src/protocol_job_reply.defs 2007-07-11 22:11:37 UTC (rev 23304) @@ -37,7 +37,9 @@ skip; /* look_up */ -skip; /* send_signal */ +simpleroutine job_mig_send_signal_reply( + __r_port : mach_port_move_send_once_t; + __result : kern_return_t, RetCode); skip; /* parent */

1 0