November 2006 - launchd-changes - lists.macosforge.org

[22942] branches/Leopard/
by source_changes＠macosforge.org 13 Nov '06

13 Nov '06

Revision: 22942 http://trac.macosforge.org/projects/launchd/changeset/22942 Author: zarzycki(a)apple.com Date: 2006-11-13 09:54:12 -0800 (Mon, 13 Nov 2006) Log Message: ----------- "Branch for Leopard from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/Leopard/ Copied: branches/Leopard (from rev 22941, trunk)

1 0

[22941] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Nov '06

13 Nov '06

Revision: 22941 http://trac.macosforge.org/projects/launchd/changeset/22941 Author: zarzycki(a)apple.com Date: 2006-11-13 09:53:16 -0800 (Mon, 13 Nov 2006) Log Message: ----------- <rdar://problem/4829691> Applications 'open'ed in 'ssh' session belong to 'root' Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-09 22:10:17 UTC (rev 22940) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-13 17:53:16 UTC (rev 22941) @@ -441,6 +441,10 @@ launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_PROGRAMARGUMENTS); } + if (j->session_create && (tmp = launch_data_new_bool(true))) { + launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_SESSIONCREATE); + } + if (j->inetcompat && (tmp = launch_data_alloc(LAUNCH_DATA_DICTIONARY))) { if ((tmp2 = launch_data_new_bool(j->inetcompat_wait))) { launch_data_dict_insert(tmp, tmp2, LAUNCH_JOBINETDCOMPATIBILITY_WAIT); @@ -781,6 +785,13 @@ return NULL; } + if (getpid() == 1) { + struct ldcred ldc; + + runtime_get_caller_creds(&ldc); + jr->mach_uid = ldc.uid; + } + jr->unload_at_exit = true; jr->stall_before_exec = w4d; jr->force_ppc = fppc; @@ -4084,7 +4095,6 @@ pid_t *child_pid, mach_port_t *obsvr_port) { job_t jr; - struct ldcred ldc; size_t offset = 0; char *tmpp; const char **argv = NULL, **env = NULL; @@ -4093,8 +4103,6 @@ const char *workingdir = NULL; size_t argv_i = 0, env_i = 0; - runtime_get_caller_creds(&ldc); - #if 0 if (ldc.asid != inherited_asid) { job_log(j, LOG_ERR, "Security: PID %d (ASID %d) was denied a request to spawn a process in this session (ASID %d)", @@ -4143,10 +4151,6 @@ return BOOTSTRAP_NO_MEMORY; } - if (getuid() == 0) { - jr->mach_uid = ldc.uid; - } - if (!job_setup_machport(jr)) { job_remove(jr); return BOOTSTRAP_NO_MEMORY;

1 0

[22940] tags/launchd-171/
by source_changes＠macosforge.org 09 Nov '06

09 Nov '06

Revision: 22940 http://trac.macosforge.org/projects/launchd/changeset/22940 Author: zarzycki(a)apple.com Date: 2006-11-09 14:10:17 -0800 (Thu, 09 Nov 2006) Log Message: ----------- "Tagging launchd-171 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-171/ Copied: tags/launchd-171 (from rev 22939, trunk)

1 0

[22939] trunk/launchd/src
by source_changes＠macosforge.org 09 Nov '06

09 Nov '06

Revision: 22939 http://trac.macosforge.org/projects/launchd/changeset/22939 Author: zarzycki(a)apple.com Date: 2006-11-09 08:13:53 -0800 (Thu, 09 Nov 2006) Log Message: ----------- <rdar://problem/4537339> BootRoot: launchd needs to call kextd early if is_bootrooted() Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2006-11-07 01:31:33 UTC (rev 22938) +++ trunk/launchd/src/Makefile.am 2006-11-09 16:13:53 UTC (rev 22939) @@ -37,7 +37,7 @@ sysconf_DATA = hostconfig rc.common rc.netboot rc.shutdown launchctl_CFLAGS = $(AM_CFLAGS) -I/System/Library/Frameworks/System.framework/PrivateHeaders -launchctl_LDFLAGS = -framework CoreFoundation -weak_library /usr/lib/libedit.dylib +launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit -weak_library /usr/lib/libedit.dylib SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) SystemStarter_LDFLAGS = -framework CoreFoundation Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2006-11-07 01:31:33 UTC (rev 22938) +++ trunk/launchd/src/Makefile.in 2006-11-09 16:13:53 UTC (rev 22939) @@ -238,7 +238,7 @@ @LIBS_ONLY_FALSE@sbin_SCRIPTS = service @LIBS_ONLY_FALSE@sysconf_DATA = hostconfig rc.common rc.netboot rc.shutdown @LIBS_ONLY_FALSE@launchctl_CFLAGS = $(AM_CFLAGS) -I/System/Library/Frameworks/System.framework/PrivateHeaders -@LIBS_ONLY_FALSE@launchctl_LDFLAGS = -framework CoreFoundation -weak_library /usr/lib/libedit.dylib +@LIBS_ONLY_FALSE@launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit -weak_library /usr/lib/libedit.dylib @LIBS_ONLY_FALSE@SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) @LIBS_ONLY_FALSE@SystemStarter_LDFLAGS = -framework CoreFoundation @LIBS_ONLY_FALSE@SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-11-07 01:31:33 UTC (rev 22938) +++ trunk/launchd/src/launchctl.c 2006-11-09 16:13:53 UTC (rev 22939) @@ -22,6 +22,7 @@ #include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CFPriv.h> +#include <IOKit/IOKitLib.h> #include <NSSystemDirectories.h> #include <mach/mach.h> #include <sys/types.h> @@ -58,6 +59,8 @@ #include <paths.h> #include <utmp.h> #include <utmpx.h> +#include <bootfiles.h> +#include <sysexits.h> #include "libbootstrap_public.h" #include "libvproc_internal.h" @@ -133,6 +136,7 @@ static void workaround4465949(void); static void do_application_firewall_magic(int sfd, launch_data_t thejob); static void preheat_page_cache_hack(void); +static void do_bootroot_magic(void); static int bootstrap_cmd(int argc, char *const argv[]); static int load_and_unload_cmd(int argc, char *const argv[]); @@ -1202,6 +1206,8 @@ do_potential_fsck(); } + do_bootroot_magic(); + if (path_check("/var/account/acct")) { assumes(acct("/var/account/acct") != -1); } @@ -2762,3 +2768,42 @@ closedir(thedir); } + + +void +do_bootroot_magic(void) +{ + const char *kextcache_tool[] = { "kextcache", "-U", "/", NULL }; + CFTypeRef bootrootProp; + io_service_t chosen; + int wstatus; + pid_t p; + + chosen = IORegistryEntryFromPath(kIOMasterPortDefault, "IODeviceTree:/chosen"); + + if (!assumes(chosen)) { + return; + } + + bootrootProp = IORegistryEntryCreateCFProperty(chosen, CFSTR(kBootRootActiveKey), kCFAllocatorDefault, 0); + + IOObjectRelease(chosen); + + if (!bootrootProp) { + return; + } + + CFRelease(bootrootProp); + + if (!assumes((p = fwexec(kextcache_tool, false)) != -1)) { + return; + } + + if (!assumes(waitpid(p, &wstatus, 0) != -1)) { + return; + } + + if (!WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == EX_OSFILE) { + assumes(reboot(RB_AUTOBOOT) != -1); + } +}

1 0

[22938] tags/launchd-170/
by source_changes＠macosforge.org 07 Nov '06

07 Nov '06

Revision: 22938 http://trac.macosforge.org/projects/launchd/changeset/22938 Author: zarzycki(a)apple.com Date: 2006-11-06 17:31:33 -0800 (Mon, 06 Nov 2006) Log Message: ----------- "Tagging launchd-170 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-170/ Copied: tags/launchd-170 (from rev 22937, trunk)

1 0

[22937] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 07 Nov '06

07 Nov '06

Revision: 22937 http://trac.macosforge.org/projects/launchd/changeset/22937 Author: zarzycki(a)apple.com Date: 2006-11-06 17:31:26 -0800 (Mon, 06 Nov 2006) Log Message: ----------- <rdar://problem/4821335> SecurityAgent crashes in InitializeDragIPC Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-03 21:23:01 UTC (rev 22936) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-07 01:31:26 UTC (rev 22937) @@ -3761,7 +3761,12 @@ job_log(j, LOG_DEBUG, "Mach service registration attempt: %s", servicename); - if (j->anonymous && job_get_bs(j)->parent == NULL && ldc.uid != 0 && ldc.uid != getuid()) { + /* + * From a per-user/session launchd's perspective, SecurityAgent (UID + * 92) is a rogue application (not our UID, not root and not a child of + * us). We'll have to reconcile this design friction at a later date. + */ + if (j->anonymous && job_get_bs(j)->parent == NULL && ldc.uid != 0 && ldc.uid != getuid() && ldc.uid != 92) { if (getpid() == 1) { return VPROC_ERR_TRY_PER_USER; } else {

1 0

[22936] trunk/launchd/src
by source_changes＠macosforge.org 03 Nov '06

03 Nov '06

Revision: 22936 http://trac.macosforge.org/projects/launchd/changeset/22936 Author: zarzycki(a)apple.com Date: 2006-11-03 13:23:01 -0800 (Fri, 03 Nov 2006) Log Message: ----------- Removing the bootstrap_look_up_array() function. This function never worked prior to Leopard, but we weren't sure if applications depended on it failing. After much research, we believe the answer is safely no. Modified Paths: -------------- trunk/launchd/src/libbootstrap.c trunk/launchd/src/libvproc_internal.h Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2006-11-03 21:02:52 UTC (rev 22935) +++ trunk/launchd/src/libbootstrap.c 2006-11-03 21:23:01 UTC (rev 22936) @@ -113,37 +113,6 @@ } kern_return_t -bootstrap_look_up_array(mach_port_t bp, - name_array_t names, mach_msg_type_number_t name_cnt, - mach_port_array_t *ports, mach_msg_type_number_t *port_cnt, - boolean_t *all) -{ - unsigned int i; - kern_return_t r; - - if (name_cnt > BOOTSTRAP_MAX_LOOKUP_COUNT) - return BOOTSTRAP_BAD_COUNT; - - *port_cnt = name_cnt; - - r = vm_allocate(mach_task_self(), (vm_address_t *)&ports, name_cnt * sizeof(mach_port_t), true); - - if (r != KERN_SUCCESS) - return r; - - *all = true; - - for (i = 0; i < name_cnt; i++) { - if (bootstrap_look_up(bp, names[i], &((*ports)[i])) == BOOTSTRAP_SUCCESS) - continue; - *all = false; - ports[i] = MACH_PORT_NULL; - } - - return BOOTSTRAP_SUCCESS; -} - -kern_return_t bootstrap_status(mach_port_t bp, name_t service_name, bootstrap_status_t *service_active) { mach_port_t p; Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2006-11-03 21:02:52 UTC (rev 22935) +++ trunk/launchd/src/libvproc_internal.h 2006-11-03 21:23:01 UTC (rev 22936) @@ -56,17 +56,7 @@ void _vproc_logv(int pri, int err, const char *msg, va_list ap); - kern_return_t -bootstrap_look_up_array( - mach_port_t bp, - name_array_t service_names, - mach_msg_type_number_t service_namesCnt, - mach_port_array_t *sps, - mach_msg_type_number_t *service_portsCnt, - boolean_t *all_services_known); - -kern_return_t bootstrap_info( mach_port_t bp, name_array_t *service_names,

1 0

[22935] tags/launchd-169/
by source_changes＠macosforge.org 03 Nov '06

03 Nov '06

Revision: 22935 http://trac.macosforge.org/projects/launchd/changeset/22935 Author: zarzycki(a)apple.com Date: 2006-11-03 13:02:52 -0800 (Fri, 03 Nov 2006) Log Message: ----------- "Tagging launchd-169 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-169/ Copied: tags/launchd-169 (from rev 22934, trunk)

1 0

[22934] trunk/launchd/src
by source_changes＠macosforge.org 03 Nov '06

03 Nov '06

Revision: 22934 http://trac.macosforge.org/projects/launchd/changeset/22934 Author: zarzycki(a)apple.com Date: 2006-11-03 11:16:05 -0800 (Fri, 03 Nov 2006) Log Message: ----------- <rdar://problem/4446357> sudo launchctl doesn't work as expected Modified Paths: -------------- trunk/launchd/src/launchd_unix_ipc.c trunk/launchd/src/liblaunch.c Modified: trunk/launchd/src/launchd_unix_ipc.c =================================================================== --- trunk/launchd/src/launchd_unix_ipc.c 2006-11-03 18:07:24 UTC (rev 22933) +++ trunk/launchd/src/launchd_unix_ipc.c 2006-11-03 19:16:05 UTC (rev 22934) @@ -134,7 +134,6 @@ goto out_bad; } snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/sock", ourdir); - setenv(LAUNCHD_SOCKET_ENV, sun.sun_path, 1); } if (unlink(sun.sun_path) == -1 && errno != ENOENT) { Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2006-11-03 18:07:24 UTC (rev 22933) +++ trunk/launchd/src/liblaunch.c 2006-11-03 19:16:05 UTC (rev 22934) @@ -160,6 +160,7 @@ char *where = getenv(LAUNCHD_SOCKET_ENV); char *_launchd_fd = getenv(LAUNCHD_TRUSTED_FD_ENV); int dfd, lfd = -1; + name_t spath; _lc = calloc(1, sizeof(struct _launch_client)); @@ -184,10 +185,14 @@ if (where && where[0] != '\0') { strncpy(sun.sun_path, where, sizeof(sun.sun_path)); - } else if (getuid() == 0) { + } else if (!getenv("SUDO_COMMAND") && _vprocmgr_getsocket(spath) == 0) { + size_t min_len; + + min_len = sizeof(sun.sun_path) < sizeof(spath) ? sizeof(sun.sun_path) : sizeof(spath); + + strncpy(sun.sun_path, spath, min_len); + } else { strncpy(sun.sun_path, LAUNCHD_SOCK_PREFIX "/sock", sizeof(sun.sun_path)); - } else { - goto out_bad; } if ((lfd = _fd(socket(AF_UNIX, SOCK_STREAM, 0))) == -1) @@ -1208,8 +1213,6 @@ usleep(20000); } - setenv(LAUNCHD_SOCKET_ENV, sp, 1); - if (flags & LOAD_ONLY_SAFEMODE_LAUNCHAGENTS) { largv[5] = "system"; }

1 0

[22933] trunk/launchd/src
by source_changes＠macosforge.org 03 Nov '06

03 Nov '06

Revision: 22933 http://trac.macosforge.org/projects/launchd/changeset/22933 Author: zarzycki(a)apple.com Date: 2006-11-03 10:07:24 -0800 (Fri, 03 Nov 2006) Log Message: ----------- Simplify an internal API. Modified Paths: -------------- trunk/launchd/src/liblaunch.c trunk/launchd/src/libvproc.c trunk/launchd/src/libvproc_internal.h Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2006-11-02 22:06:55 UTC (rev 22932) +++ trunk/launchd/src/liblaunch.c 2006-11-03 18:07:24 UTC (rev 22933) @@ -1200,25 +1200,31 @@ u = pwe->pw_uid; g = pwe->pw_gid; - if ((ldp = fexecv_as_user(login, u, g, ldargv)) == -1) + if ((ldp = fexecv_as_user(login, u, g, ldargv)) == -1) { return -1; + } - while (_vprocmgr_getsocket(bootstrap_port, sp) != BOOTSTRAP_SUCCESS) + while (_vprocmgr_getsocket(sp) != BOOTSTRAP_SUCCESS) { usleep(20000); + } setenv(LAUNCHD_SOCKET_ENV, sp, 1); - if (flags & LOAD_ONLY_SAFEMODE_LAUNCHAGENTS) + if (flags & LOAD_ONLY_SAFEMODE_LAUNCHAGENTS) { largv[5] = "system"; + } - if ((p = fexecv_as_user(login, u, g, largv)) == -1) + if ((p = fexecv_as_user(login, u, g, largv)) == -1) { return -1; + } - if (waitpid(p, &wstatus, 0) != p) + if (waitpid(p, &wstatus, 0) != p) { return -1; + } - if (!(WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0)) + if (!(WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0)) { return -1; + } #define BEZEL_UI_PATH "/System/Library/LoginPlugins/BezelServices.loginPlugin/Contents/Resources/BezelUI/BezelUIServer" #define BEZEL_UI_PLIST "/System/Library/LaunchAgents/com.apple.BezelUIServer.plist" Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2006-11-02 22:06:55 UTC (rev 22932) +++ trunk/launchd/src/libvproc.c 2006-11-03 18:07:24 UTC (rev 22933) @@ -158,9 +158,9 @@ } kern_return_t -_vprocmgr_getsocket(mach_port_t bp, name_t sockpath) +_vprocmgr_getsocket(name_t sockpath) { - return vproc_mig_getsocket(bp, sockpath); + return vproc_mig_getsocket(bootstrap_port, sockpath); } vproc_err_t Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2006-11-02 22:06:55 UTC (rev 22932) +++ trunk/launchd/src/libvproc_internal.h 2006-11-03 18:07:24 UTC (rev 22933) @@ -52,7 +52,7 @@ name_array_t *service_names, mach_msg_type_number_t *service_namesCnt, mach_port_array_t *ports, mach_msg_type_number_t *portCnt); -kern_return_t _vprocmgr_getsocket(mach_port_t bp, name_t); +kern_return_t _vprocmgr_getsocket(name_t); void _vproc_logv(int pri, int err, const char *msg, va_list ap);

1 0