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

[22932] trunk/launchd/src
by source_changes＠macosforge.org 02 Nov '06

02 Nov '06

Revision: 22932 http://trac.macosforge.org/projects/launchd/changeset/22932 Author: zarzycki(a)apple.com Date: 2006-11-02 14:06:55 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Some progress is better than none. Part one of the per-user (not per-session) launchd concept. In this, we kick off an per-user launchd (on demand) whenever a user tries to talk directly to the root bootstrap. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_mig_types.defs trunk/launchd/src/libbootstrap.c trunk/launchd/src/libvproc_internal.h trunk/launchd/src/libvproc_private.h trunk/launchd/src/protocol_job.defs Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-02 21:22:06 UTC (rev 22931) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-02 22:06:55 UTC (rev 22932) @@ -96,7 +96,7 @@ SLIST_ENTRY(machservice) sle; job_t job; mach_port_name_t port; - unsigned int isActive:1, reset:1, recv:1, hide:1, kUNCServer:1, __junk:27; + unsigned int isActive:1, reset:1, recv:1, hide:1, kUNCServer:1, must_match_uid:1; char name[0]; }; @@ -2761,7 +2761,6 @@ goto out_bad2; } *serviceport = ms->port; - ms->isActive = false; ms->recv = true; } else { ms->port = *serviceport; @@ -3648,6 +3647,71 @@ } kern_return_t +job_mig_lookup_per_user_context(job_t j, uid_t which_user, mach_port_t *up_cont) +{ + struct ldcred ldc; + job_t ji, jbs = root_job; + +#if 0 + jbs = job_get_bs(j); +#endif + + runtime_get_caller_creds(&ldc); + + if (ldc.uid != 0) { + which_user = ldc.uid; + } + + if (which_user == 0) { + return BOOTSTRAP_NOT_PRIVILEGED; + } + + *up_cont = MACH_PORT_NULL; + + SLIST_FOREACH(ji, &jbs->jobs, sle) { + if (ji->mach_uid != which_user) { + continue; + } + if (SLIST_EMPTY(&ji->machservices)) { + continue; + } + if (!SLIST_FIRST(&ji->machservices)->must_match_uid) { + continue; + } + break; + } + + if (ji == NULL) { + struct machservice *ms; + char lbuf[1024]; + + sprintf(lbuf, "com.apple.launchd.peruser.%u", which_user); + + ji = job_new(jbs, lbuf, "/sbin/launchd", NULL, NULL, 0); + + if (ji == NULL) { + return BOOTSTRAP_NO_MEMORY; + } + + ji->mach_uid = which_user; + + if ((ms = machservice_new(ji, lbuf, up_cont)) == NULL) { + job_remove(ji); + return BOOTSTRAP_NO_MEMORY; + } + + ms->must_match_uid = true; + ms->hide = true; + + job_dispatch(ji, false); + } + + *up_cont = machservice_port(SLIST_FIRST(&ji->machservices)); + + return 0; +} + +kern_return_t job_mig_check_in(job_t j, name_t servicename, mach_port_t *serviceportp) { static pid_t last_warned_pid = 0; @@ -3691,9 +3755,19 @@ runtime_get_caller_creds(&ldc); +#if 0 job_log(j, LOG_NOTICE, "bootstrap_register() is deprecated. PID: %u Service: %s", ldc.pid, servicename); +#endif 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()) { + if (getpid() == 1) { + return VPROC_ERR_TRY_PER_USER; + } else { + return BOOTSTRAP_NOT_PRIVILEGED; + } + } ms = job_lookup_service(j, servicename, false); @@ -3728,10 +3802,16 @@ runtime_get_caller_creds(&ldc); + if (getpid() == 1 && j->anonymous && job_get_bs(j)->parent == NULL && ldc.uid != 0 && ldc.euid != 0) { + return VPROC_ERR_TRY_PER_USER; + } + ms = job_lookup_service(j, servicename, true); if (ms && machservice_hidden(ms) && !job_active(machservice_job(ms))) { ms = NULL; + } else if (ms && ms->must_match_uid) { + ms = NULL; } if (ms) { Modified: trunk/launchd/src/launchd_mig_types.defs =================================================================== --- trunk/launchd/src/launchd_mig_types.defs 2006-11-02 21:22:06 UTC (rev 22931) +++ trunk/launchd/src/launchd_mig_types.defs 2006-11-02 22:06:55 UTC (rev 22932) @@ -24,6 +24,8 @@ */ type pid_t = integer_t; +type uid_t = integer_t; +type gid_t = integer_t; type get_set_int_key_t = integer_t; type logmsg_t = c_string[*:2048]; type cmd_t = c_string[512]; Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2006-11-02 21:22:06 UTC (rev 22931) +++ trunk/launchd/src/libbootstrap.c 2006-11-02 22:06:55 UTC (rev 22932) @@ -21,6 +21,9 @@ #include "config.h" #include "libbootstrap_public.h" +#include "libvproc_public.h" +#include "libvproc_private.h" + #include <mach/mach.h> #include <mach/vm_map.h> @@ -63,7 +66,18 @@ kern_return_t bootstrap_register(mach_port_t bp, name_t service_name, mach_port_t sp) { - return vproc_mig_register(bp, service_name, sp); + kern_return_t kr = vproc_mig_register(bp, service_name, sp); + + if (kr == VPROC_ERR_TRY_PER_USER) { + mach_port_t puc; + + if (vproc_mig_lookup_per_user_context(bp, 0, &puc) == 0) { + kr = vproc_mig_register(puc, service_name, sp); + mach_port_deallocate(mach_task_self(), puc); + } + } + + return kr; } kern_return_t @@ -81,7 +95,21 @@ kern_return_t bootstrap_look_up(mach_port_t bp, name_t service_name, mach_port_t *sp) { - return vproc_mig_look_up(bp, service_name, sp); + kern_return_t kr; + mach_port_t puc; + + if ((kr = vproc_mig_look_up(bp, service_name, sp)) != VPROC_ERR_TRY_PER_USER) { + return kr; + } + + if ((kr = vproc_mig_lookup_per_user_context(bp, 0, &puc)) != 0) { + return kr; + } + + kr = vproc_mig_look_up(puc, service_name, sp); + mach_port_deallocate(mach_task_self(), puc); + + return kr; } kern_return_t Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2006-11-02 21:22:06 UTC (rev 22931) +++ trunk/launchd/src/libvproc_internal.h 2006-11-02 22:06:55 UTC (rev 22932) @@ -37,6 +37,8 @@ #include "launchd_core_logic.h" #endif +#define VPROC_ERR_TRY_PER_USER 1099 + #pragma GCC visibility push(default) #define SPAWN_HAS_PATH 0x0001 Modified: trunk/launchd/src/libvproc_private.h =================================================================== --- trunk/launchd/src/libvproc_private.h 2006-11-02 21:22:06 UTC (rev 22931) +++ trunk/launchd/src/libvproc_private.h 2006-11-02 22:06:55 UTC (rev 22932) @@ -21,6 +21,7 @@ */ #include <sys/cdefs.h> +#include <sys/syslog.h> #include <stdbool.h> __BEGIN_DECLS Modified: trunk/launchd/src/protocol_job.defs =================================================================== --- trunk/launchd/src/protocol_job.defs 2006-11-02 21:22:06 UTC (rev 22931) +++ trunk/launchd/src/protocol_job.defs 2006-11-02 22:06:55 UTC (rev 22932) @@ -37,7 +37,7 @@ routine create_server( __bs_port : job_t; __server_cmd : cmd_t; - __server_uid : natural_t; + __server_uid : uid_t; __on_demand : boolean_t; out __server_port : mach_port_make_send_t); @@ -125,3 +125,8 @@ __pri : integer_t; __err : integer_t; __msg : logmsg_t); + +routine lookup_per_user_context( + __bs_port : job_t; + __wu : uid_t; + out __u_cont : mach_port_t);

1 0

[22931] trunk/launchd/src
by source_changes＠macosforge.org 02 Nov '06

02 Nov '06

Revision: 22931 http://trac.macosforge.org/projects/launchd/changeset/22931 Author: zarzycki(a)apple.com Date: 2006-11-02 13:22:06 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Avoid sprintf() where we can. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-11-01 21:43:30 UTC (rev 22930) +++ trunk/launchd/src/launchd.c 2006-11-02 21:22:06 UTC (rev 22931) @@ -272,7 +272,7 @@ } if (h) { - sprintf(ldconf, "%s/%s", h, LAUNCHD_CONF); + snprintf(ldconf, sizeof(ldconf), "%s/%s", h, LAUNCHD_CONF); } rlcj = job_new(root_job, READCONF_LABEL, LAUNCHCTL_PATH, NULL, ldconf, MACH_PORT_NULL); Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-11-01 21:43:30 UTC (rev 22930) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-02 21:22:06 UTC (rev 22931) @@ -715,11 +715,11 @@ } /* preflight the string so we know how big it is */ - sprintf(buf, "%s.%s", sizeof(void *) == 8 ? "0xdeadbeeffeedface" : "0xbabecafe", basename((char *)argv[0])); + snprintf(buf, sizeof(buf), "%s.%s", sizeof(void *) == 8 ? "0xdeadbeeffeedface" : "0xbabecafe", basename((char *)argv[0])); j = job_new(jbs, buf, NULL, argv, NULL, MACH_PORT_NULL); - sprintf(j->label, "%p.%s", j, basename(j->argv[0])); + snprintf(j->label, strlen(j->label) + 1, "%p.%s", j, basename(j->argv[0])); free(argv); @@ -830,7 +830,7 @@ char newlabel[1000], *procname = "unknown"; job_t jr; - sprintf(newlabel, "%u.anonymous", MACH_PORT_INDEX(p->bs_port)); + snprintf(newlabel, sizeof(newlabel), "%u.anonymous", MACH_PORT_INDEX(p->bs_port)); if ((jr = job_new(p, newlabel, procname, NULL, NULL, MACH_PORT_NULL))) { jr->anonymous = true; @@ -1746,7 +1746,7 @@ if (sipc) { job_assumes(j, close(spair[0]) == 0); - sprintf(nbuf, "%d", spair[1]); + snprintf(nbuf, sizeof(nbuf), "%d", spair[1]); setenv(LAUNCHD_TRUSTED_FD_ENV, nbuf, 1); } job_start_child(j, execspair[1]); @@ -2133,9 +2133,9 @@ o = job_prep_log_preface(j, newmsg); if (err) { - sprintf(newmsg + o, ": %s: %s", msg, strerror(err)); + snprintf(newmsg + o, sizeof(newmsg) - o, ": %s: %s", msg, strerror(err)); } else { - sprintf(newmsg + o, ": %s", msg); + snprintf(newmsg + o, sizeof(newmsg) - o, ": %s", msg); } if (j->debug) { @@ -2409,7 +2409,7 @@ } for (i = 0; i < sg->fd_cnt; i++) - buf_off += sprintf(buf + buf_off, " %d", sg->fds[i]); + buf_off += snprintf(buf + buf_off, sizeof(buf) - buf_off, " %d", sg->fds[i]); job_log(j, LOG_DEBUG, "Ignoring Sockets:%s", buf); @@ -2428,7 +2428,7 @@ } for (i = 0; i < sg->fd_cnt; i++) - buf_off += sprintf(buf + buf_off, " %d", sg->fds[i]); + buf_off += snprintf(buf + buf_off, sizeof(buf) - buf_off, " %d", sg->fds[i]); job_log(j, LOG_DEBUG, "Watching sockets:%s", buf); @@ -2963,7 +2963,7 @@ goto out_bad; } - sprintf(j->label, "%d", MACH_PORT_INDEX(j->bs_port)); + snprintf(j->label, strlen(j->label) + 1, "%d", MACH_PORT_INDEX(j->bs_port)); /* Sigh... at the moment, MIG has maxsize == sizeof(reply union) */ mxmsgsz = sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem); @@ -3280,7 +3280,7 @@ char pidstr[100]; pid_t sp; - sprintf(pidstr, "%u", j->p); + snprintf(pidstr, sizeof(pidstr), "%u", j->p); switch ((sp = fork())) { case -1: Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2006-11-01 21:43:30 UTC (rev 22930) +++ trunk/launchd/src/launchd_runtime.c 2006-11-02 21:22:06 UTC (rev 22931) @@ -678,7 +678,7 @@ return; } - sprintf(newmsg, "p%u pp%u\t", getpid(), getppid()); + snprintf(newmsg, sizeof(newmsg), "p%u pp%u\t", getpid(), getppid()); for (i = 0, j = strlen(newmsg); message[i];) { if (message[i] == '%' && message[i + 1] == 'm') { Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2006-11-01 21:43:30 UTC (rev 22930) +++ trunk/launchd/src/libvproc.c 2006-11-02 21:22:06 UTC (rev 22931) @@ -193,8 +193,7 @@ { char flat_msg[3000]; - snprintf(flat_msg, sizeof(flat_msg) - 1, msg, ap); - flat_msg[sizeof(flat_msg) - 1] = '\0'; + vsnprintf(flat_msg, sizeof(flat_msg), msg, ap); vproc_mig_log(bootstrap_port, pri, err, flat_msg); }

1 0

[22930] tags/launchd-168/
by source_changes＠macosforge.org 01 Nov '06

01 Nov '06

Revision: 22930 http://trac.macosforge.org/projects/launchd/changeset/22930 Author: zarzycki(a)apple.com Date: 2006-11-01 13:43:30 -0800 (Wed, 01 Nov 2006) Log Message: ----------- "Tagging launchd-168 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-168/ Copied: tags/launchd-168 (from rev 22929, trunk)

1 0

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

01 Nov '06

Revision: 22929 http://trac.macosforge.org/projects/launchd/changeset/22929 Author: zarzycki(a)apple.com Date: 2006-11-01 13:33:33 -0800 (Wed, 01 Nov 2006) Log Message: ----------- <rdar://problem/4808268> 9A297: Stuck at Blue Screen after MacBuddy on M39 (DS and security agent very very busy) 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-10-31 22:00:53 UTC (rev 22928) +++ trunk/launchd/src/launchd_core_logic.c 2006-11-01 21:33:33 UTC (rev 22929) @@ -269,7 +269,7 @@ static void job_export_all2(job_t j, launch_data_t where); static launch_data_t job_export2(job_t j, bool subjobs); static job_t job_find_by_pid(job_t j, pid_t p, bool recurse); -static job_t job_new_spawn(const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d, bool fppc); +static job_t job_new_spawn(job_t j, const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d, bool fppc); static job_t job_new_via_mach_init(job_t jbs, const char *cmd, uid_t uid, bool ond); static job_t job_new_bootstrap(job_t p, mach_port_t requestorport, mach_port_t checkin_port); static bool job_new_anonymous(job_t p); @@ -766,16 +766,16 @@ } job_t -job_new_spawn(const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d, bool fppc) +job_new_spawn(job_t j, const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d, bool fppc) { job_t jr; - if ((jr = job_find(root_job, label)) != NULL) { + if ((jr = job_find(j, label)) != NULL) { errno = EEXIST; return NULL; } - jr = job_new(root_job, label, path, argv, NULL, MACH_PORT_NULL); + jr = job_new(j, label, path, argv, NULL, MACH_PORT_NULL); if (!jr) { return NULL; @@ -4048,7 +4048,7 @@ } } - jr = job_new_spawn(label, path, workingdir, argv, env, flags & SPAWN_HAS_UMASK ? &mig_umask : NULL, + jr = job_new_spawn(job_get_bs(j), label, path, workingdir, argv, env, flags & SPAWN_HAS_UMASK ? &mig_umask : NULL, flags & SPAWN_WANTS_WAIT4DEBUGGER, flags & SPAWN_WANTS_FORCE_PPC); if (jr == NULL) switch (errno) {

1 0