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

[23699] trunk/launchd/src
by source_changes＠macosforge.org 25 Aug '08

25 Aug '08

Revision: 23699 http://trac.macosforge.org/projects/launchd/changeset/23699 Author: dsorresso(a)apple.com Date: 2008-08-25 14:11:07 -0700 (Mon, 25 Aug 2008) Log Message: ----------- Backing out change for rdar://problem/6003804, which caused rdar://problem/6173994. Will re-integrate once rdar://problem/6006324 is fixed. Modified Paths: -------------- trunk/launchd/src/launchd_internal.defs trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_internal.defs =================================================================== --- trunk/launchd/src/launchd_internal.defs 2008-08-22 23:01:23 UTC (rev 23698) +++ trunk/launchd/src/launchd_internal.defs 2008-08-25 21:11:07 UTC (rev 23699) @@ -28,3 +28,6 @@ routine handle_kqueue( __port : mach_port_t; __fd : integer_t); + +routine handle_mport( + __port : mach_port_t); Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2008-08-22 23:01:23 UTC (rev 23698) +++ trunk/launchd/src/launchd_runtime.c 2008-08-25 21:11:07 UTC (rev 23699) @@ -86,9 +86,9 @@ static int bulk_kev_cnt; static pthread_t kqueue_demand_thread; +static pthread_t demand_thread; -static void mportset_callback(void); -static kq_callback kqmportset_callback = (kq_callback)mportset_callback; +static void *mport_demand_loop(void *arg); static void *kqueue_demand_loop(void *arg); static void log_kevent_struct(int level, struct kevent *kev_base, int indx); @@ -155,8 +155,6 @@ launchd_assert((errno = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_PORT_SET, &demand_port_set)) == KERN_SUCCESS); launchd_assert((errno = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_PORT_SET, &ipc_port_set)) == KERN_SUCCESS); - launchd_assert(kevent_mod(demand_port_set, EVFILT_MACHPORT, EV_ADD, 0, 0, &kqmportset_callback) != -1); - launchd_assert(launchd_mport_create_recv(&launchd_internal_port) == KERN_SUCCESS); launchd_assert(launchd_mport_make_send(launchd_internal_port) == KERN_SUCCESS); @@ -174,6 +172,12 @@ launchd_assert(pthread_create(&kqueue_demand_thread, &attr, kqueue_demand_loop, NULL) == 0); pthread_attr_destroy(&attr); + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN); + launchd_assert(pthread_create(&demand_thread, &attr, mport_demand_loop, NULL) == 0); + pthread_attr_destroy(&attr); + launchd_assumes(sysctlbyname("vfs.generic.noremotehang", NULL, NULL, &p, sizeof(p)) != -1); } @@ -188,6 +192,25 @@ } } +void * +mport_demand_loop(void *arg __attribute__((unused))) +{ + mach_msg_empty_rcv_t dummy; + kern_return_t kr; + + for (;;) { + kr = mach_msg(&dummy.header, MACH_RCV_MSG|MACH_RCV_LARGE, 0, 0, demand_port_set, 0, MACH_PORT_NULL); + if (unlikely(kr == MACH_RCV_PORT_CHANGED)) { + break; + } else if (!launchd_assumes(kr == MACH_RCV_TOO_LARGE)) { + continue; + } + launchd_assumes(handle_mport(launchd_internal_port) == 0); + } + + return NULL; +} + INTERNAL_ABI const char * proc_flags_to_C_names(unsigned int flags) { @@ -508,8 +531,8 @@ indx, kev->udata, kev->data, ident_buf, filter_str, flags_buf, fflags_buf); } -void -mportset_callback(void) +kern_return_t +x_handle_mport(mach_port_t junk __attribute__((unused))) { mach_port_name_array_t members; mach_msg_type_number_t membersCnt; @@ -519,7 +542,7 @@ unsigned int i; if (!launchd_assumes((errno = mach_port_get_set_status(mach_task_self(), demand_port_set, &members, &membersCnt)) == KERN_SUCCESS)) { - return; + return 1; } for (i = 0; i < membersCnt; i++) { @@ -547,6 +570,8 @@ launchd_assumes(vm_deallocate(mach_task_self(), (vm_address_t)members, (vm_size_t) membersCnt * sizeof(mach_port_name_t)) == KERN_SUCCESS); + + return 0; } void *

1 0

[23698] tags/launchd-281/
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23698 http://trac.macosforge.org/projects/launchd/changeset/23698 Author: dsorresso(a)apple.com Date: 2008-08-22 16:01:23 -0700 (Fri, 22 Aug 2008) Log Message: ----------- "Tagging launchd-281 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-281/ Copied: tags/launchd-281 (from rev 23697, trunk)

1 0

[23697] trunk/launchd/src
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23697 http://trac.macosforge.org/projects/launchd/changeset/23697 Author: dsorresso(a)apple.com Date: 2008-08-22 15:53:46 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Merging in changes for rdar://problem/6112446 Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libbootstrap.c trunk/launchd/src/libbootstrap_private.h trunk/launchd/src/protocol_job.defs Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:48:58 UTC (rev 23696) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:53:46 UTC (rev 23697) @@ -6507,6 +6507,7 @@ kr = BOOTSTRAP_SUCCESS; } else if (!per_pid_lookup && (inherited_bootstrap_port != MACH_PORT_NULL)) { job_log(j, LOG_DEBUG, "Mach service lookup forwarded: %s", servicename); + /* Clients potentially check the audit token of the reply to verify that the returned send right is trustworthy. */ job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, 0, 0) == 0); /* The previous routine moved the reply port, we're forced to return MIG_NO_REPLY now */ return MIG_NO_REPLY; Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2008-08-22 22:48:58 UTC (rev 23696) +++ trunk/launchd/src/libbootstrap.c 2008-08-22 22:53:46 UTC (rev 23697) @@ -141,6 +141,7 @@ kern_return_t bootstrap_look_up_per_user(mach_port_t bp, name_t service_name, uid_t target_user, mach_port_t *sp) { + audit_token_t au_tok; struct stat sb; kern_return_t kr; mach_port_t puc; @@ -153,7 +154,7 @@ return kr; } - kr = vproc_mig_look_up2(puc, service_name, sp, 0, 0); + kr = vproc_mig_look_up2(puc, service_name, sp, &au_tok, 0, 0); mach_port_deallocate(mach_task_self(), puc); return kr; @@ -173,6 +174,7 @@ static mach_port_t prev_bp; static mach_port_t prev_sp; static name_t prev_name; + audit_token_t au_tok; bool per_pid_lookup = flags & BOOTSTRAP_PER_PID_SERVICE; kern_return_t kr = 0; mach_port_t puc; @@ -195,7 +197,7 @@ } skip_cache: - if ((kr = vproc_mig_look_up2(bp, service_name, sp, target_pid, flags)) != VPROC_ERR_TRY_PER_USER) { + if ((kr = vproc_mig_look_up2(bp, service_name, sp, &au_tok, target_pid, flags)) != VPROC_ERR_TRY_PER_USER) { goto out; } @@ -203,7 +205,7 @@ goto out; } - kr = vproc_mig_look_up2(puc, service_name, sp, target_pid, flags); + kr = vproc_mig_look_up2(puc, service_name, sp, &au_tok, target_pid, flags); mach_port_deallocate(mach_task_self(), puc); out: @@ -217,6 +219,27 @@ pthread_mutex_unlock(&bslu2_lock); + if ((kr == 0) && (flags & BOOTSTRAP_PRIVILEGED_SERVER)) { + uid_t server_euid; + + /* + * The audit token magic is dependent on the per-user launchd + * forwarding MIG requests to the root launchd when it cannot + * find the answer locally. + */ + + /* This API should be in Libsystem, but is not */ + //audit_token_to_au32(au_tok, NULL, &server_euid, NULL, NULL, NULL, NULL, NULL, NULL); + + server_euid = au_tok.val[1]; + + if (server_euid) { + mach_port_deallocate(mach_task_self(), *sp); + kr = BOOTSTRAP_NOT_PRIVILEGED; + } + + } + return kr; } Modified: trunk/launchd/src/libbootstrap_private.h =================================================================== --- trunk/launchd/src/libbootstrap_private.h 2008-08-22 22:48:58 UTC (rev 23696) +++ trunk/launchd/src/libbootstrap_private.h 2008-08-22 22:53:46 UTC (rev 23697) @@ -30,6 +30,7 @@ #define BOOTSTRAP_PER_PID_SERVICE 0x1 #define BOOTSTRAP_ALLOW_LOOKUP 0x2 #define BOOTSTRAP_DENY_JOB_CREATION 0x4 +#define BOOTSTRAP_PRIVILEGED_SERVER 0x8 kern_return_t bootstrap_register2(mach_port_t bp, name_t service_name, mach_port_t sp, uint64_t flags); Modified: trunk/launchd/src/protocol_job.defs =================================================================== --- trunk/launchd/src/protocol_job.defs 2008-08-22 22:48:58 UTC (rev 23696) +++ trunk/launchd/src/protocol_job.defs 2008-08-22 22:53:46 UTC (rev 23697) @@ -67,6 +67,7 @@ sreplyport __rport : mach_port_make_send_once_t; __service_name : name_t; out __service_port : mach_port_t; + UserAuditToken __server_cred: audit_token_t; __target_pid : pid_t; __flags : uint64_t);

1 0

[23696] trunk/launchd/src
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23696 http://trac.macosforge.org/projects/launchd/changeset/23696 Author: dsorresso(a)apple.com Date: 2008-08-22 15:48:58 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Merging in changes for rdar://problem/6003804 Modified Paths: -------------- trunk/launchd/src/launchd_internal.defs trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_internal.defs =================================================================== --- trunk/launchd/src/launchd_internal.defs 2008-08-22 22:42:13 UTC (rev 23695) +++ trunk/launchd/src/launchd_internal.defs 2008-08-22 22:48:58 UTC (rev 23696) @@ -28,6 +28,3 @@ routine handle_kqueue( __port : mach_port_t; __fd : integer_t); - -routine handle_mport( - __port : mach_port_t); Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2008-08-22 22:42:13 UTC (rev 23695) +++ trunk/launchd/src/launchd_runtime.c 2008-08-22 22:48:58 UTC (rev 23696) @@ -86,9 +86,9 @@ static int bulk_kev_cnt; static pthread_t kqueue_demand_thread; -static pthread_t demand_thread; -static void *mport_demand_loop(void *arg); +static void mportset_callback(void); +static kq_callback kqmportset_callback = (kq_callback)mportset_callback; static void *kqueue_demand_loop(void *arg); static void log_kevent_struct(int level, struct kevent *kev_base, int indx); @@ -155,6 +155,8 @@ launchd_assert((errno = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_PORT_SET, &demand_port_set)) == KERN_SUCCESS); launchd_assert((errno = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_PORT_SET, &ipc_port_set)) == KERN_SUCCESS); + launchd_assert(kevent_mod(demand_port_set, EVFILT_MACHPORT, EV_ADD, 0, 0, &kqmportset_callback) != -1); + launchd_assert(launchd_mport_create_recv(&launchd_internal_port) == KERN_SUCCESS); launchd_assert(launchd_mport_make_send(launchd_internal_port) == KERN_SUCCESS); @@ -172,12 +174,6 @@ launchd_assert(pthread_create(&kqueue_demand_thread, &attr, kqueue_demand_loop, NULL) == 0); pthread_attr_destroy(&attr); - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN); - launchd_assert(pthread_create(&demand_thread, &attr, mport_demand_loop, NULL) == 0); - pthread_attr_destroy(&attr); - launchd_assumes(sysctlbyname("vfs.generic.noremotehang", NULL, NULL, &p, sizeof(p)) != -1); } @@ -192,25 +188,6 @@ } } -void * -mport_demand_loop(void *arg __attribute__((unused))) -{ - mach_msg_empty_rcv_t dummy; - kern_return_t kr; - - for (;;) { - kr = mach_msg(&dummy.header, MACH_RCV_MSG|MACH_RCV_LARGE, 0, 0, demand_port_set, 0, MACH_PORT_NULL); - if (unlikely(kr == MACH_RCV_PORT_CHANGED)) { - break; - } else if (!launchd_assumes(kr == MACH_RCV_TOO_LARGE)) { - continue; - } - launchd_assumes(handle_mport(launchd_internal_port) == 0); - } - - return NULL; -} - INTERNAL_ABI const char * proc_flags_to_C_names(unsigned int flags) { @@ -531,8 +508,8 @@ indx, kev->udata, kev->data, ident_buf, filter_str, flags_buf, fflags_buf); } -kern_return_t -x_handle_mport(mach_port_t junk __attribute__((unused))) +void +mportset_callback(void) { mach_port_name_array_t members; mach_msg_type_number_t membersCnt; @@ -542,7 +519,7 @@ unsigned int i; if (!launchd_assumes((errno = mach_port_get_set_status(mach_task_self(), demand_port_set, &members, &membersCnt)) == KERN_SUCCESS)) { - return 1; + return; } for (i = 0; i < membersCnt; i++) { @@ -570,8 +547,6 @@ launchd_assumes(vm_deallocate(mach_task_self(), (vm_address_t)members, (vm_size_t) membersCnt * sizeof(mach_port_name_t)) == KERN_SUCCESS); - - return 0; } void *

1 0

[23695] trunk/launchd/src/rc.netboot
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23695 http://trac.macosforge.org/projects/launchd/changeset/23695 Author: dsorresso(a)apple.com Date: 2008-08-22 15:42:13 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Merging changes for rdar://problem/5977502. Modified Paths: -------------- trunk/launchd/src/rc.netboot Modified: trunk/launchd/src/rc.netboot =================================================================== --- trunk/launchd/src/rc.netboot 2008-08-22 22:41:11 UTC (rev 23694) +++ trunk/launchd/src/rc.netboot 2008-08-22 22:42:13 UTC (rev 23695) @@ -1,6 +1,6 @@ #!/bin/sh ## -# Copyright 2002 Apple Computer, Inc. +# Copyright 2002-2008 Apple Inc. # # This script configures NetBoot ## @@ -105,7 +105,11 @@ return 1 fi case "${mount_from}" in - afp:*) fstype=afp;; + afp:*) + fstype=afp + kextload /System/Library/Filesystems/AppleShare/asp_tcp.kext + kextload /System/Library/Filesystems/AppleShare/afpfs.kext + ;; nfs:*) fstype=nfs;; *) echo "unknown network filesystem mount from ${mount_from}" return 1

1 0

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

22 Aug '08

Revision: 23694 http://trac.macosforge.org/projects/launchd/changeset/23694 Author: dsorresso(a)apple.com Date: 2008-08-22 15:41:11 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Merging in changes for rdar://problem/5923864. 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-22 22:31:47 UTC (rev 23693) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:41:11 UTC (rev 23694) @@ -475,6 +475,7 @@ static bool job_setup_machport(job_t j); static void job_setup_fd(job_t j, int target_fd, const char *path, int flags); static void job_postfork_become_user(job_t j); +static void job_enable_audit_for_user(job_t j, uid_t u, char *name); static void job_postfork_test_user(job_t j); static void job_log_pids_with_weird_uids(job_t j); static void job_force_sampletool(job_t j); @@ -3355,6 +3356,8 @@ desired_gid = gre->gr_gid; } + job_enable_audit_for_user(j, desired_uid, loginname); + if (!job_assumes(j, setlogin(loginname) != -1)) { _exit(EXIT_FAILURE); } @@ -3391,6 +3394,28 @@ } void +job_enable_audit_for_user(job_t j, uid_t u, char *name) +{ + auditinfo_t auinfo = { + .ai_auid = u, + .ai_asid = j->p, + }; + long au_cond; + + if (!job_assumes(j, auditon(A_GETCOND, &au_cond, sizeof(long)) == 0)) { + _exit(EXIT_FAILURE); + } + + if (au_cond != AUC_NOAUDIT) { + if (!job_assumes(j, au_user_mask(name, &auinfo.ai_mask) == 0)) { + _exit(EXIT_FAILURE); + } else if (!job_assumes(j, setaudit(&auinfo) == 0)) { + _exit(EXIT_FAILURE); + } + } +} + +void job_setup_attributes(job_t j) { struct limititem *li;

1 0

[23693] trunk/launchd/src
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23693 http://trac.macosforge.org/projects/launchd/changeset/23693 Author: dsorresso(a)apple.com Date: 2008-08-22 15:31:47 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Rolling back last merge that blew away changes for merge before that. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/rc.netboot Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:06:26 UTC (rev 23692) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:31:47 UTC (rev 23693) @@ -475,7 +475,6 @@ static bool job_setup_machport(job_t j); static void job_setup_fd(job_t j, int target_fd, const char *path, int flags); static void job_postfork_become_user(job_t j); -static void job_enable_audit_for_user(job_t j, uid_t u, char *name); static void job_postfork_test_user(job_t j); static void job_log_pids_with_weird_uids(job_t j); static void job_force_sampletool(job_t j); @@ -3356,8 +3355,6 @@ desired_gid = gre->gr_gid; } - job_enable_audit_for_user(j, desired_uid, loginname); - if (!job_assumes(j, setlogin(loginname) != -1)) { _exit(EXIT_FAILURE); } @@ -3394,28 +3391,6 @@ } void -job_enable_audit_for_user(job_t j, uid_t u, char *name) -{ - auditinfo_t auinfo = { - .ai_auid = u, - .ai_asid = j->p, - }; - long au_cond; - - if (!job_assumes(j, auditon(A_GETCOND, &au_cond, sizeof(long)) == 0)) { - _exit(EXIT_FAILURE); - } - - if (au_cond != AUC_NOAUDIT) { - if (!job_assumes(j, au_user_mask(name, &auinfo.ai_mask) == 0)) { - _exit(EXIT_FAILURE); - } else if (!job_assumes(j, setaudit(&auinfo) == 0)) { - _exit(EXIT_FAILURE); - } - } -} - -void job_setup_attributes(job_t j) { struct limititem *li; @@ -4201,7 +4176,11 @@ return; } - envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) ) { + envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + } else { + job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key); + } } bool Modified: trunk/launchd/src/rc.netboot =================================================================== --- trunk/launchd/src/rc.netboot 2008-08-22 22:06:26 UTC (rev 23692) +++ trunk/launchd/src/rc.netboot 2008-08-22 22:31:47 UTC (rev 23693) @@ -1,6 +1,6 @@ #!/bin/sh ## -# Copyright 2002-2008 Apple Inc. +# Copyright 2002 Apple Computer, Inc. # # This script configures NetBoot ## @@ -105,11 +105,7 @@ return 1 fi case "${mount_from}" in - afp:*) - fstype=afp - kextload /System/Library/Filesystems/AppleShare/asp_tcp.kext - kextload /System/Library/Filesystems/AppleShare/afpfs.kext - ;; + afp:*) fstype=afp;; nfs:*) fstype=nfs;; *) echo "unknown network filesystem mount from ${mount_from}" return 1

1 0

[23692] trunk/launchd/src
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23692 http://trac.macosforge.org/projects/launchd/changeset/23692 Author: dsorresso(a)apple.com Date: 2008-08-22 15:06:26 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Merging in changes for rdar://problem/5923864 Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/rc.netboot Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:03:45 UTC (rev 23691) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:06:26 UTC (rev 23692) @@ -475,6 +475,7 @@ static bool job_setup_machport(job_t j); static void job_setup_fd(job_t j, int target_fd, const char *path, int flags); static void job_postfork_become_user(job_t j); +static void job_enable_audit_for_user(job_t j, uid_t u, char *name); static void job_postfork_test_user(job_t j); static void job_log_pids_with_weird_uids(job_t j); static void job_force_sampletool(job_t j); @@ -3355,6 +3356,8 @@ desired_gid = gre->gr_gid; } + job_enable_audit_for_user(j, desired_uid, loginname); + if (!job_assumes(j, setlogin(loginname) != -1)) { _exit(EXIT_FAILURE); } @@ -3391,6 +3394,28 @@ } void +job_enable_audit_for_user(job_t j, uid_t u, char *name) +{ + auditinfo_t auinfo = { + .ai_auid = u, + .ai_asid = j->p, + }; + long au_cond; + + if (!job_assumes(j, auditon(A_GETCOND, &au_cond, sizeof(long)) == 0)) { + _exit(EXIT_FAILURE); + } + + if (au_cond != AUC_NOAUDIT) { + if (!job_assumes(j, au_user_mask(name, &auinfo.ai_mask) == 0)) { + _exit(EXIT_FAILURE); + } else if (!job_assumes(j, setaudit(&auinfo) == 0)) { + _exit(EXIT_FAILURE); + } + } +} + +void job_setup_attributes(job_t j) { struct limititem *li; @@ -4176,11 +4201,7 @@ return; } - if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) ) { - envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); - } else { - job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key); - } + envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); } bool Modified: trunk/launchd/src/rc.netboot =================================================================== --- trunk/launchd/src/rc.netboot 2008-08-22 22:03:45 UTC (rev 23691) +++ trunk/launchd/src/rc.netboot 2008-08-22 22:06:26 UTC (rev 23692) @@ -1,6 +1,6 @@ #!/bin/sh ## -# Copyright 2002 Apple Computer, Inc. +# Copyright 2002-2008 Apple Inc. # # This script configures NetBoot ## @@ -105,7 +105,11 @@ return 1 fi case "${mount_from}" in - afp:*) fstype=afp;; + afp:*) + fstype=afp + kextload /System/Library/Filesystems/AppleShare/asp_tcp.kext + kextload /System/Library/Filesystems/AppleShare/afpfs.kext + ;; nfs:*) fstype=nfs;; *) echo "unknown network filesystem mount from ${mount_from}" return 1

1 0

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

22 Aug '08

Revision: 23691 http://trac.macosforge.org/projects/launchd/changeset/23691 Author: dsorresso(a)apple.com Date: 2008-08-22 15:03:45 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Merging in changes for rdar://problem/5874233 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-22 21:34:46 UTC (rev 23690) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:03:45 UTC (rev 23691) @@ -3662,13 +3662,13 @@ } if (unlikely(j->debug)) { - oldmask = runtime_setlogmask(LOG_UPTO(LOG_DEBUG)); + oldmask = setlogmask(LOG_UPTO(LOG_DEBUG)); } runtime_vsyslog(&attr, newmsg, ap); if (unlikely(j->debug)) { - runtime_setlogmask(oldmask); + setlogmask(oldmask); } } @@ -4176,7 +4176,11 @@ return; } - envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) ) { + envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + } else { + job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key); + } } bool

1 0

[23690] branches/PR-5898404/launchd/src
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23690 http://trac.macosforge.org/projects/launchd/changeset/23690 Author: dsorresso(a)apple.com Date: 2008-08-22 14:34:46 -0700 (Fri, 22 Aug 2008) Log Message: ----------- Added a few comments. Put in a fix for an issue found during investigation of rdar://problem/6045086, which doesn't appear to be a launchd bug, so I'm just rolling the fix in here since it's simple enough. Changed _vproc_transaction_begin() to use a compare-and-swap loop to enforce the assumption that the transaction count is one greater after increment and thus making the termination logic correct. Modified Paths: -------------- branches/PR-5898404/launchd/src/launchd_core_logic.c branches/PR-5898404/launchd/src/launchd_runtime.c branches/PR-5898404/launchd/src/libvproc.c Modified: branches/PR-5898404/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-5898404/launchd/src/launchd_core_logic.c 2008-08-22 02:32:06 UTC (rev 23689) +++ branches/PR-5898404/launchd/src/launchd_core_logic.c 2008-08-22 21:34:46 UTC (rev 23690) @@ -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; @@ -1054,6 +1054,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); Modified: branches/PR-5898404/launchd/src/launchd_runtime.c =================================================================== --- branches/PR-5898404/launchd/src/launchd_runtime.c 2008-08-22 02:32:06 UTC (rev 23689) +++ branches/PR-5898404/launchd/src/launchd_runtime.c 2008-08-22 21:34:46 UTC (rev 23690) @@ -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: branches/PR-5898404/launchd/src/libvproc.c =================================================================== --- branches/PR-5898404/launchd/src/libvproc.c 2008-08-22 02:32:06 UTC (rev 23689) +++ branches/PR-5898404/launchd/src/libvproc.c 2008-08-22 21:34:46 UTC (rev 23690) @@ -96,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) { @@ -105,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

1 0