August 2008 - launchd-changes - lists.macosforge.org

[23709] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 23709 http://trac.macosforge.org/projects/launchd/changeset/23709 Author: dsorresso(a)apple.com Date: 2008-08-29 17:01:50 -0700 (Fri, 29 Aug 2008) Log Message: ----------- Fix for rdar://problem/5984126. Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2008-08-29 23:23:53 UTC (rev 23708) +++ trunk/launchd/src/launchctl.c 2008-08-30 00:01:50 UTC (rev 23709) @@ -1415,11 +1415,6 @@ loopback_setup_ipv4(); loopback_setup_ipv6(); - if (path_check("/etc/rc.server")) { - const char *rcserver_tool[] = { _PATH_BSHELL, "/etc/rc.server", NULL }; - assumes(fwexec(rcserver_tool, NULL) != -1); - } - apply_sysctls_from_file("/etc/sysctl.conf"); if (path_check("/etc/rc.cdrom")) { @@ -1437,6 +1432,11 @@ do_potential_fsck(); } + if (path_check("/etc/rc.server")) { + const char *rcserver_tool[] = { _PATH_BSHELL, "/etc/rc.server", NULL }; + assumes(fwexec(rcserver_tool, NULL) != -1); + } + read_launchd_conf(); if (path_check("/var/account/acct")) {

1 0

[23708] trunk/launchd/src
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 23708 http://trac.macosforge.org/projects/launchd/changeset/23708 Author: dsorresso(a)apple.com Date: 2008-08-29 16:23:53 -0700 (Fri, 29 Aug 2008) Log Message: ----------- Fixes for rdar://problem/6153301 and rdar://problem/5553797. Minor tweaks to the job_mig_set_service_policy() logging. Added a kqueue timer for shutdown to log jobs still active. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_mig_types.defs trunk/launchd/src/libbootstrap.c trunk/launchd/src/libbootstrap_private.h trunk/launchd/src/libbootstrap_public.h Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2008-08-28 19:39:50 UTC (rev 23707) +++ trunk/launchd/src/launchd.c 2008-08-29 23:23:53 UTC (rev 23708) @@ -67,6 +67,7 @@ #include <setjmp.h> #include <spawn.h> #include <sched.h> +#include <pthread.h> #include "libbootstrap_public.h" #include "libvproc_public.h" @@ -96,9 +97,12 @@ static void fatal_signal_handler(int sig, siginfo_t *si, void *uap); static void handle_pid1_crashes_separately(void); +static void *update_thread(void *nothing); + static bool re_exec_in_single_user_mode; static void *crash_addr; static pid_t crash_pid; +static unsigned int g_sync_frequency = 30; bool shutdown_in_progress; bool fake_shutdown_in_progress; @@ -165,6 +169,13 @@ _vproc_transaction_end(); } + if( pid1_magic ) { + /* Start the update thread -- rdar://problem/5039559&6153301 */ + pthread_t t = NULL; + int err = pthread_create(&t, NULL, update_thread, NULL); + launchd_assumes(err == 0); + } + jobmgr_init(sflag); launchd_runtime_init2(); @@ -187,6 +198,16 @@ launchd_assumes(sigaction(SIGSEGV, &fsa, NULL) != -1); } +void *update_thread(void *nothing __attribute__((unused))) +{ + while( g_sync_frequency ) { + sync(); + sleep(g_sync_frequency); + } + + return NULL; +} + #define PID1_CRASH_LOGFILE "/var/log/launchd-pid1.crash" /* This hack forces the dynamic linker to resolve these symbols ASAP */ Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-08-28 19:39:50 UTC (rev 23707) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-29 23:23:53 UTC (rev 23708) @@ -855,7 +855,9 @@ } if (do_apple_internal_logging && jm->parentmgr == NULL && pid1_magic) { - runtime_set_timeout(still_alive_with_check, 5); + if( pid1_magic ) { + jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, 5, jm)); + } } return jobmgr_do_garbage_collection(jm); @@ -2794,7 +2796,7 @@ break; case EVFILT_SIGNAL: switch (kev->ident) { - case SIGTERM: + case SIGTERM: return launchd_shutdown(); case SIGUSR1: return calendarinterval_callback(); @@ -2832,6 +2834,9 @@ case EVFILT_TIMER: if (jobmgr_assumes(jm, kev->ident == (uintptr_t)&sorted_calendar_events)) { calendarinterval_callback(); + } else if( kev->ident == (uintptr_t)jm ) { + jobmgr_log(jm, LOG_DEBUG, "Shutdown timer firing."); + still_alive_with_check(); } break; default: @@ -7134,8 +7139,18 @@ return BOOTSTRAP_NO_MEMORY; } - if (ldc->euid && (ldc->euid != getuid())) { - job_log(j, LOG_ERR, "Denied Mach service policy update against PID %u due to mismatched credentials: UID/EUID %u/%u", target_pid, ldc->uid, ldc->euid); + if (ldc->euid && (ldc->euid != getuid())) { + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, target_pid }; + struct kinfo_proc kp; + size_t len = sizeof(kp); + + job_assumes(j, sysctl(mib, 4, &kp, &len, NULL, 0) != -1); + + uid_t kp_euid = kp.kp_eproc.e_ucred.cr_uid; + uid_t kp_uid = kp.kp_eproc.e_pcred.p_ruid; + + job_log(j, LOG_ERR, "Denied Mach service policy update requested by UID/EUID %u/%u against PID %u with UID/EUID %u/%u due to mismatched credentials.", ldc->uid, ldc->euid, target_pid, kp_uid, kp_euid); + return BOOTSTRAP_NOT_PRIVILEGED; } Modified: trunk/launchd/src/launchd_mig_types.defs =================================================================== --- trunk/launchd/src/launchd_mig_types.defs 2008-08-28 19:39:50 UTC (rev 23707) +++ trunk/launchd/src/launchd_mig_types.defs 2008-08-29 23:23:53 UTC (rev 23708) @@ -23,16 +23,16 @@ * Copyright, 1990. All rights reserved. */ -type pid_t = integer_t; -type pid_array_t = ^array [] of pid_t; -type uid_t = integer_t; -type gid_t = integer_t; -type vproc_gsk_t = integer_t; -type logmsg_t = c_string[*:2048]; -type cmd_t = c_string[512]; -type name_t = c_string[128]; -type name_array_t = ^array [] of name_t; -type bootstrap_status_t = integer_t; +type pid_t = integer_t; +type pid_array_t = ^array [] of pid_t; +type uid_t = integer_t; +type gid_t = integer_t; +type vproc_gsk_t = integer_t; +type logmsg_t = c_string[*:2048]; +type cmd_t = c_string[512]; +type name_t = c_string[128]; +type name_array_t = ^array [] of name_t; +type bootstrap_status_t = integer_t; type bootstrap_status_array_t = ^array [] of bootstrap_status_t; type job_t = mach_port_t Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2008-08-28 19:39:50 UTC (rev 23707) +++ trunk/launchd/src/libbootstrap.c 2008-08-29 23:23:53 UTC (rev 23708) @@ -127,19 +127,19 @@ } kern_return_t -bootstrap_check_in(mach_port_t bp, name_t service_name, mach_port_t *sp) +bootstrap_check_in(mach_port_t bp, const name_t service_name, mach_port_t *sp) { - return vproc_mig_check_in2(bp, service_name, sp, 0); + return vproc_mig_check_in2(bp, (char *)service_name, sp, 0); } kern_return_t -bootstrap_check_in2(mach_port_t bp, name_t service_name, mach_port_t *sp, uint64_t flags) +bootstrap_check_in2(mach_port_t bp, const name_t service_name, mach_port_t *sp, uint64_t flags) { - return vproc_mig_check_in2(bp, service_name, sp, flags); + return vproc_mig_check_in2(bp, (char *)service_name, sp, flags); } kern_return_t -bootstrap_look_up_per_user(mach_port_t bp, name_t service_name, uid_t target_user, mach_port_t *sp) +bootstrap_look_up_per_user(mach_port_t bp, const name_t service_name, uid_t target_user, mach_port_t *sp) { audit_token_t au_tok; struct stat sb; @@ -154,7 +154,7 @@ return kr; } - kr = vproc_mig_look_up2(puc, service_name, sp, &au_tok, 0, 0); + kr = vproc_mig_look_up2(puc, (char *)service_name, sp, &au_tok, 0, 0); mach_port_deallocate(mach_task_self(), puc); return kr; @@ -162,13 +162,13 @@ kern_return_t -bootstrap_look_up(mach_port_t bp, name_t service_name, mach_port_t *sp) +bootstrap_look_up(mach_port_t bp, const name_t service_name, mach_port_t *sp) { return bootstrap_look_up2(bp, service_name, sp, 0, 0); } kern_return_t -bootstrap_look_up2(mach_port_t bp, name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags) +bootstrap_look_up2(mach_port_t bp, const name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags) { static pthread_mutex_t bslu2_lock = PTHREAD_MUTEX_INITIALIZER; static mach_port_t prev_bp; @@ -197,7 +197,7 @@ } skip_cache: - if ((kr = vproc_mig_look_up2(bp, service_name, sp, &au_tok, target_pid, flags)) != VPROC_ERR_TRY_PER_USER) { + if ((kr = vproc_mig_look_up2(bp, (char *)service_name, sp, &au_tok, target_pid, flags)) != VPROC_ERR_TRY_PER_USER) { goto out; } @@ -205,7 +205,7 @@ goto out; } - kr = vproc_mig_look_up2(puc, service_name, sp, &au_tok, target_pid, flags); + kr = vproc_mig_look_up2(puc, (char *)service_name, sp, &au_tok, target_pid, flags); mach_port_deallocate(mach_task_self(), puc); out: Modified: trunk/launchd/src/libbootstrap_private.h =================================================================== --- trunk/launchd/src/libbootstrap_private.h 2008-08-28 19:39:50 UTC (rev 23707) +++ trunk/launchd/src/libbootstrap_private.h 2008-08-29 23:23:53 UTC (rev 23708) @@ -34,11 +34,11 @@ kern_return_t bootstrap_register2(mach_port_t bp, name_t service_name, mach_port_t sp, uint64_t flags); -kern_return_t bootstrap_look_up2(mach_port_t bp, name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags); +kern_return_t bootstrap_look_up2(mach_port_t bp, const name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags); -kern_return_t bootstrap_check_in2(mach_port_t bp, name_t service_name, mach_port_t *sp, uint64_t flags); +kern_return_t bootstrap_check_in2(mach_port_t bp, const name_t service_name, mach_port_t *sp, uint64_t flags); -kern_return_t bootstrap_look_up_per_user(mach_port_t bp, name_t service_name, uid_t target_user, mach_port_t *sp); +kern_return_t bootstrap_look_up_per_user(mach_port_t bp, const name_t service_name, uid_t target_user, mach_port_t *sp); kern_return_t bootstrap_set_policy(mach_port_t bp, pid_t target_pid, uint64_t flags, const char *target_service); Modified: trunk/launchd/src/libbootstrap_public.h =================================================================== --- trunk/launchd/src/libbootstrap_public.h 2008-08-28 19:39:50 UTC (rev 23707) +++ trunk/launchd/src/libbootstrap_public.h 2008-08-29 23:23:53 UTC (rev 23708) @@ -306,7 +306,7 @@ */ kern_return_t bootstrap_check_in( mach_port_t bp, - name_t service_name, + const name_t service_name, mach_port_t *sp); /* @@ -321,7 +321,7 @@ */ kern_return_t bootstrap_look_up( mach_port_t bp, - name_t service_name, + const name_t service_name, mach_port_t *sp); /*

1 0

[23707] trunk/launchd/src
by source_changes＠macosforge.org 28 Aug '08

28 Aug '08

Revision: 23707 http://trac.macosforge.org/projects/launchd/changeset/23707 Author: dsorresso(a)apple.com Date: 2008-08-28 12:39:50 -0700 (Thu, 28 Aug 2008) Log Message: ----------- Additional logging for rdar://problem/6045086. Minor adjustment to log for rdar://problem/5982485. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-08-28 07:00:04 UTC (rev 23706) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-28 19:39:50 UTC (rev 23707) @@ -2529,7 +2529,7 @@ } } } else { - job_log(j, LOG_DEBUG, "Tried to dispatch an already active job."); + job_log(j, LOG_DEBUG, "Tried to dispatch an already active job (%s), kickstart = %s.", job_active(j), kickstart ? "YES" : "NO"); } return j; @@ -2703,10 +2703,13 @@ job_callback_timer(job_t j, void *ident) { if (j == ident) { + job_log(j, LOG_DEBUG, "j == ident (%p)", ident); job_dispatch(j, true); } else if (&j->semaphores == ident) { + job_log(j, LOG_DEBUG, "&j->semaphores == ident (%p)", ident); job_dispatch(j, false); } else if (&j->start_interval == ident) { + job_log(j, LOG_DEBUG, "&j->start_interval == ident (%p)", ident); j->start_pending = true; job_dispatch(j, false); } else if (&j->exit_timeout == ident) { @@ -7132,8 +7135,7 @@ } if (ldc->euid && (ldc->euid != getuid())) { - char *pidpath = j->prog ? j->prog : ( j->argv[0] ? j->argv[0] : NULL ); - job_log(j, LOG_WARNING, "Returning BOOTSTRAP_NOT_PRIVILEGED to PID %d (%s) with uid = %d, euid = %d", ldc->pid, pidpath, ldc->uid, ldc->euid); + job_log(j, LOG_ERR, "Denied Mach service policy update against PID %u due to mismatched credentials: UID/EUID %u/%u", target_pid, ldc->uid, ldc->euid); return BOOTSTRAP_NOT_PRIVILEGED; } Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2008-08-28 07:00:04 UTC (rev 23706) +++ trunk/launchd/src/launchd_runtime.c 2008-08-28 19:39:50 UTC (rev 23707) @@ -632,7 +632,7 @@ runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END); #if 1 } else { - log_kevent_struct(LOG_EMERG, kevi, 0); + log_kevent_struct(LOG_EMERG, kevi, i); } #endif }

1 0

[23706] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 28 Aug '08

28 Aug '08

Revision: 23706 http://trac.macosforge.org/projects/launchd/changeset/23706 Author: dsorresso(a)apple.com Date: 2008-08-28 00:00:04 -0700 (Thu, 28 Aug 2008) Log Message: ----------- Fix for rdar://problem/6173809. Additional logging for problems with set_service_policy(). Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-08-27 22:17:52 UTC (rev 23705) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-28 07:00:04 UTC (rev 23706) @@ -3111,7 +3111,7 @@ } errno = psf(NULL, file2exec, NULL, &spattr, (char *const*)argv, environ); - job_log_error(j, LOG_ERR, "posix_spawn(\"%s\", ...)", j->prog); + job_log_error(j, LOG_ERR, "posix_spawn(\"%s\", ...)", file2exec); out_bad: _exit(EXIT_FAILURE); @@ -7132,6 +7132,8 @@ } if (ldc->euid && (ldc->euid != getuid())) { + char *pidpath = j->prog ? j->prog : ( j->argv[0] ? j->argv[0] : NULL ); + job_log(j, LOG_WARNING, "Returning BOOTSTRAP_NOT_PRIVILEGED to PID %d (%s) with uid = %d, euid = %d", ldc->pid, pidpath, ldc->uid, ldc->euid); return BOOTSTRAP_NOT_PRIVILEGED; }

1 0

[23705] trunk/launchd/src/launchd_unix_ipc.c
by source_changes＠macosforge.org 27 Aug '08

27 Aug '08

Revision: 23705 http://trac.macosforge.org/projects/launchd/changeset/23705 Author: dsorresso(a)apple.com Date: 2008-08-27 15:17:52 -0700 (Wed, 27 Aug 2008) Log Message: ----------- Merging change for rdar://problem/5986602. Modified Paths: -------------- trunk/launchd/src/launchd_unix_ipc.c Modified: trunk/launchd/src/launchd_unix_ipc.c =================================================================== --- trunk/launchd/src/launchd_unix_ipc.c 2008-08-27 22:14:00 UTC (rev 23704) +++ trunk/launchd/src/launchd_unix_ipc.c 2008-08-27 22:17:52 UTC (rev 23705) @@ -472,12 +472,6 @@ gstr = "kern.maxfiles"; pstr = "kern.maxfilesperproc"; break; - case RLIMIT_NPROC: - /* kernel will not clamp to this value, we must */ - if (gval > (2048 + 20)) { - gval = 2048 + 20; - } - break; default: break; }

1 0

[23704] trunk/launchd/src/liblaunch.c
by source_changes＠macosforge.org 27 Aug '08

27 Aug '08

Revision: 23704 http://trac.macosforge.org/projects/launchd/changeset/23704 Author: dsorresso(a)apple.com Date: 2008-08-27 15:14:00 -0700 (Wed, 27 Aug 2008) Log Message: ----------- Nevermind. Modified Paths: -------------- trunk/launchd/src/liblaunch.c Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2008-08-27 21:50:57 UTC (rev 23703) +++ trunk/launchd/src/liblaunch.c 2008-08-27 22:14:00 UTC (rev 23704) @@ -608,16 +608,17 @@ launch_data_pack(launch_data_t d, void *where, size_t len, int *fd_where, size_t *fd_cnt) { launch_data_t o_in_w = where; - size_t i, rsz, total_data_len = sizeof(struct _launch_data); + size_t i, rsz, node_data_len = sizeof(struct _launch_data); - if (total_data_len > len) { + if (node_data_len > len) { return 0; } - where += total_data_len; + where += node_data_len; o_in_w->type = host2wire(d->type); + size_t pad_len = 0; switch (d->type) { case LAUNCH_DATA_INTEGER: o_in_w->number = host2wire(d->number); @@ -640,44 +641,55 @@ break; case LAUNCH_DATA_STRING: o_in_w->string_len = host2wire(d->string_len); - total_data_len += ROUND_TO_64BIT_WORD_SIZE(strlen(d->string) + 1); - if (total_data_len > len) { + node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1); + + if (node_data_len > len) { return 0; } - memcpy(where, d->string, strlen(d->string) + 1); + memcpy(where, d->string, d->string_len + 1); + + /* Zero padded data. */ + pad_len = ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1) - (d->string_len + 1); + bzero(where + d->string_len + 1, pad_len); + break; case LAUNCH_DATA_OPAQUE: o_in_w->opaque_size = host2wire(d->opaque_size); - total_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); - if (total_data_len > len) { + node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); + if (node_data_len > len) { return 0; } memcpy(where, d->opaque, d->opaque_size); + + /* Zero padded data. */ + pad_len = ROUND_TO_64BIT_WORD_SIZE(d->opaque_size) - d->opaque_size; + bzero(where + d->opaque_size, pad_len); + break; case LAUNCH_DATA_DICTIONARY: case LAUNCH_DATA_ARRAY: o_in_w->_array_cnt = host2wire(d->_array_cnt); - total_data_len += d->_array_cnt * sizeof(uint64_t); - if (total_data_len > len) { + node_data_len += d->_array_cnt * sizeof(uint64_t); + if (node_data_len > len) { return 0; } where += d->_array_cnt * sizeof(uint64_t); for (i = 0; i < d->_array_cnt; i++) { - rsz = launch_data_pack(d->_array[i], where, len - total_data_len, fd_where, fd_cnt); + rsz = launch_data_pack(d->_array[i], where, len - node_data_len, fd_where, fd_cnt); if (rsz == 0) { return 0; } where += rsz; - total_data_len += rsz; + node_data_len += rsz; } break; default: break; } - return total_data_len; + return node_data_len; } launch_data_t

1 0

[23703] trunk/launchd/src/liblaunch.c
by source_changes＠macosforge.org 27 Aug '08

27 Aug '08

Revision: 23703 http://trac.macosforge.org/projects/launchd/changeset/23703 Author: dsorresso(a)apple.com Date: 2008-08-27 14:50:57 -0700 (Wed, 27 Aug 2008) Log Message: ----------- Oops, wrong branch for rdar://problem/5978442. Modified Paths: -------------- trunk/launchd/src/liblaunch.c Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2008-08-27 18:34:05 UTC (rev 23702) +++ trunk/launchd/src/liblaunch.c 2008-08-27 21:50:57 UTC (rev 23703) @@ -608,17 +608,16 @@ launch_data_pack(launch_data_t d, void *where, size_t len, int *fd_where, size_t *fd_cnt) { launch_data_t o_in_w = where; - size_t i, rsz, node_data_len = sizeof(struct _launch_data); + size_t i, rsz, total_data_len = sizeof(struct _launch_data); - if (node_data_len > len) { + if (total_data_len > len) { return 0; } - where += node_data_len; + where += total_data_len; o_in_w->type = host2wire(d->type); - size_t pad_len = 0; switch (d->type) { case LAUNCH_DATA_INTEGER: o_in_w->number = host2wire(d->number); @@ -641,55 +640,44 @@ break; case LAUNCH_DATA_STRING: o_in_w->string_len = host2wire(d->string_len); - node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1); - - if (node_data_len > len) { + total_data_len += ROUND_TO_64BIT_WORD_SIZE(strlen(d->string) + 1); + if (total_data_len > len) { return 0; } - memcpy(where, d->string, d->string_len + 1); - - /* Zero padded data. */ - pad_len = ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1) - (d->string_len + 1); - bzero(where + d->string_len + 1, pad_len); - + memcpy(where, d->string, strlen(d->string) + 1); break; case LAUNCH_DATA_OPAQUE: o_in_w->opaque_size = host2wire(d->opaque_size); - node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); - if (node_data_len > len) { + total_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); + if (total_data_len > len) { return 0; } memcpy(where, d->opaque, d->opaque_size); - - /* Zero padded data. */ - pad_len = ROUND_TO_64BIT_WORD_SIZE(d->opaque_size) - d->opaque_size; - bzero(where + d->opaque_size, pad_len); - break; case LAUNCH_DATA_DICTIONARY: case LAUNCH_DATA_ARRAY: o_in_w->_array_cnt = host2wire(d->_array_cnt); - node_data_len += d->_array_cnt * sizeof(uint64_t); - if (node_data_len > len) { + total_data_len += d->_array_cnt * sizeof(uint64_t); + if (total_data_len > len) { return 0; } where += d->_array_cnt * sizeof(uint64_t); for (i = 0; i < d->_array_cnt; i++) { - rsz = launch_data_pack(d->_array[i], where, len - node_data_len, fd_where, fd_cnt); + rsz = launch_data_pack(d->_array[i], where, len - total_data_len, fd_where, fd_cnt); if (rsz == 0) { return 0; } where += rsz; - node_data_len += rsz; + total_data_len += rsz; } break; default: break; } - return node_data_len; + return total_data_len; } launch_data_t

1 0

[23702] trunk
by source_changes＠macosforge.org 27 Aug '08

27 Aug '08

Revision: 23702 http://trac.macosforge.org/projects/launchd/changeset/23702 Author: dsorresso(a)apple.com Date: 2008-08-27 11:34:05 -0700 (Wed, 27 Aug 2008) Log Message: ----------- Merging changes for rdar://problem/5978442. Modified Paths: -------------- trunk/launchd/src/liblaunch.c Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404:23681-23700 + /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2008-08-27 18:32:52 UTC (rev 23701) +++ trunk/launchd/src/liblaunch.c 2008-08-27 18:34:05 UTC (rev 23702) @@ -608,16 +608,17 @@ launch_data_pack(launch_data_t d, void *where, size_t len, int *fd_where, size_t *fd_cnt) { launch_data_t o_in_w = where; - size_t i, rsz, total_data_len = sizeof(struct _launch_data); + size_t i, rsz, node_data_len = sizeof(struct _launch_data); - if (total_data_len > len) { + if (node_data_len > len) { return 0; } - where += total_data_len; + where += node_data_len; o_in_w->type = host2wire(d->type); + size_t pad_len = 0; switch (d->type) { case LAUNCH_DATA_INTEGER: o_in_w->number = host2wire(d->number); @@ -640,44 +641,55 @@ break; case LAUNCH_DATA_STRING: o_in_w->string_len = host2wire(d->string_len); - total_data_len += ROUND_TO_64BIT_WORD_SIZE(strlen(d->string) + 1); - if (total_data_len > len) { + node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1); + + if (node_data_len > len) { return 0; } - memcpy(where, d->string, strlen(d->string) + 1); + memcpy(where, d->string, d->string_len + 1); + + /* Zero padded data. */ + pad_len = ROUND_TO_64BIT_WORD_SIZE(d->string_len + 1) - (d->string_len + 1); + bzero(where + d->string_len + 1, pad_len); + break; case LAUNCH_DATA_OPAQUE: o_in_w->opaque_size = host2wire(d->opaque_size); - total_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); - if (total_data_len > len) { + node_data_len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size); + if (node_data_len > len) { return 0; } memcpy(where, d->opaque, d->opaque_size); + + /* Zero padded data. */ + pad_len = ROUND_TO_64BIT_WORD_SIZE(d->opaque_size) - d->opaque_size; + bzero(where + d->opaque_size, pad_len); + break; case LAUNCH_DATA_DICTIONARY: case LAUNCH_DATA_ARRAY: o_in_w->_array_cnt = host2wire(d->_array_cnt); - total_data_len += d->_array_cnt * sizeof(uint64_t); - if (total_data_len > len) { + node_data_len += d->_array_cnt * sizeof(uint64_t); + if (node_data_len > len) { return 0; } where += d->_array_cnt * sizeof(uint64_t); for (i = 0; i < d->_array_cnt; i++) { - rsz = launch_data_pack(d->_array[i], where, len - total_data_len, fd_where, fd_cnt); + rsz = launch_data_pack(d->_array[i], where, len - node_data_len, fd_where, fd_cnt); if (rsz == 0) { return 0; } where += rsz; - total_data_len += rsz; + node_data_len += rsz; } break; default: break; } - return total_data_len; + return node_data_len; } launch_data_t

1 0

[23701] trunk
by source_changes＠macosforge.org 27 Aug '08

27 Aug '08

Revision: 23701 http://trac.macosforge.org/projects/launchd/changeset/23701 Author: dsorresso(a)apple.com Date: 2008-08-27 11:32:52 -0700 (Wed, 27 Aug 2008) Log Message: ----------- Merging changes for rdar://problem/5898404. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/libvproc.c trunk/launchd/src/libvproc_private.h Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-5898404:23681-23700 Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-08-25 21:11:32 UTC (rev 23700) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-27 18:32:52 UTC (rev 23701) @@ -336,7 +336,7 @@ #define AUTO_PICK_LEGACY_LABEL (const char *)(~0) struct job_s { - kq_callback kqjob_callback; + kq_callback kqjob_callback; /* MUST be first element of this structure for benefit of launchd's run loop. */ LIST_ENTRY(job_s) sle; LIST_ENTRY(job_s) pid_hash_sle; LIST_ENTRY(job_s) label_hash_sle; @@ -1055,6 +1055,11 @@ job_assumes(j, kevent_mod((uintptr_t)&j->semaphores, EVFILT_TIMER, EV_DELETE, 0, 0, j) != -1); } + if( j->exit_timeout ) { + /* Not a big deal if this fails. It means that the timer's already been freed. */ + kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); + } + kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); LIST_REMOVE(j, sle); @@ -6046,6 +6051,10 @@ *outval = oldmask; umask(oldmask); break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + job_log(j, LOG_DEBUG, "Reading transaction model status."); + *outval = j->kill_via_shmem; + break; case 0: *outval = 0; break; @@ -6110,6 +6119,15 @@ umask((mode_t) inval); } break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + if( !job_assumes(j, inval != 0) ) { + job_log(j, LOG_WARNING, "Attempt to unregister from transaction model. This is not supported."); + kr = 1; + } else { + job_log(j, LOG_DEBUG, "Now participating in transaction model."); + j->kill_via_shmem = (bool)inval; + job_log(j, LOG_DEBUG, "j->kill_via_shmem = %s", j->kill_via_shmem ? "YES" : "NO"); + } case 0: break; default: Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2008-08-25 21:11:32 UTC (rev 23700) +++ trunk/launchd/src/launchd_runtime.c 2008-08-27 18:32:52 UTC (rev 23701) @@ -616,9 +616,15 @@ kevi = &kev[i]; if (kevi->filter) { +/* Leave on for SnowLeopard development. We should really try and identify what bugs would + * cause kevi->udata to be invalid. + */ #if 1 Dl_info dli; + /* Check if kevi->udata was either malloc(3)ed or is a valid function pointer. + * If neither, it's probably an invalid pointer and we should log it. + */ if (launchd_assumes(malloc_size(kevi->udata) || dladdr(kevi->udata, &dli))) { #endif runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kevi->ident, kevi->filter, kevi->fflags); Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2008-08-25 21:11:32 UTC (rev 23700) +++ trunk/launchd/src/libvproc.c 2008-08-27 18:32:52 UTC (rev 23701) @@ -56,6 +56,7 @@ static int64_t cached_pid = -1; static struct vproc_shmem_s *vproc_shmem; static pthread_once_t shmem_inited = PTHREAD_ONCE_INIT; +static uint64_t s_cached_transactions_enabled = 0; static void vproc_shmem_init(void) @@ -95,8 +96,6 @@ void _vproc_transaction_begin(void) { - typeof(vproc_shmem->vp_shmem_transaction_cnt) newval; - if (unlikely(vproc_shmem == NULL)) { int po_r = pthread_once(&shmem_inited, vproc_shmem_init); if (po_r != 0 || vproc_shmem == NULL) { @@ -104,17 +103,20 @@ } } - newval = __sync_add_and_fetch(&vproc_shmem->vp_shmem_transaction_cnt, 1); - - if (unlikely(newval < 1)) { - if (vproc_shmem->vp_shmem_flags & VPROC_SHMEM_EXITING) { - raise(SIGKILL); - __crashreporter_info__ = "raise(SIGKILL) failed"; - } else { - __crashreporter_info__ = "Unbalanced: vproc_transaction_begin()"; + typeof(vproc_shmem->vp_shmem_transaction_cnt) old = 0; + do { + old = vproc_shmem->vp_shmem_transaction_cnt; + + if (unlikely(old < 0)) { + if (vproc_shmem->vp_shmem_flags & VPROC_SHMEM_EXITING) { + raise(SIGKILL); + __crashreporter_info__ = "raise(SIGKILL) failed"; + } else { + __crashreporter_info__ = "Unbalanced: vproc_transaction_begin()"; + } + abort(); } - abort(); - } + } while( !__sync_bool_compare_and_swap(&vproc_shmem->vp_shmem_transaction_cnt, old, old + 1) ); } size_t @@ -643,6 +645,23 @@ return NULL; } break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + /* Shared memory region is required for transactions. */ + if( unlikely(vproc_shmem == NULL) ) { + int po_r = pthread_once(&shmem_inited, vproc_shmem_init); + if( po_r != 0 || vproc_shmem == NULL ) { + if( outval ) { + *outval = -1; + } + return (vproc_err_t)vproc_swap_integer; + } + } + + if( s_cached_transactions_enabled && outval ) { + *outval = s_cached_transactions_enabled; + return NULL; + } + break; default: break; } @@ -655,6 +674,10 @@ case VPROC_GSK_IS_MANAGED: cached_is_managed = outval ? *outval : dummyval; break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + /* Once you're in the transaction model, you're in for good. Like the Mafia. */ + s_cached_transactions_enabled = 1; + break; default: break; } Modified: trunk/launchd/src/libvproc_private.h =================================================================== --- trunk/launchd/src/libvproc_private.h 2008-08-25 21:11:32 UTC (rev 23700) +++ trunk/launchd/src/libvproc_private.h 2008-08-27 18:32:52 UTC (rev 23701) @@ -51,6 +51,7 @@ VPROC_GSK_GLOBAL_LOG_MASK, VPROC_GSK_GLOBAL_UMASK, VPROC_GSK_ABANDON_PROCESS_GROUP, + VPROC_GSK_TRANSACTIONS_ENABLED } vproc_gsk_t; vproc_err_t vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval);

1 0

[23700] tags/launchd-282/
by source_changes＠macosforge.org 25 Aug '08

25 Aug '08

Revision: 23700 http://trac.macosforge.org/projects/launchd/changeset/23700 Author: dsorresso(a)apple.com Date: 2008-08-25 14:11:32 -0700 (Mon, 25 Aug 2008) Log Message: ----------- "Tagging launchd-282 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-282/ Copied: tags/launchd-282 (from rev 23699, trunk)

1 0