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

[23639] tags/launchd-280/
by source_changes＠macosforge.org 28 May '08

28 May '08

Revision: 23639 http://trac.macosforge.org/projects/launchd/changeset/23639 Author: zarzycki(a)apple.com Date: 2008-05-28 13:33:08 -0700 (Wed, 28 May 2008) Log Message: ----------- "Tagging launchd-280 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-280/ Copied: tags/launchd-280 (from rev 23638, trunk)

1 0

[23638] branches/SULeopard/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 28 May '08

28 May '08

Revision: 23638 http://trac.macosforge.org/projects/launchd/changeset/23638 Author: zarzycki(a)apple.com Date: 2008-05-28 10:28:23 -0700 (Wed, 28 May 2008) Log Message: ----------- <rdar://problem/5968115> sandbox_init: Could not set default launchd policy, err=1100 Modified Paths: -------------- branches/SULeopard/launchd/src/launchd_core_logic.c Modified: branches/SULeopard/launchd/src/launchd_core_logic.c =================================================================== --- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-05-28 17:21:25 UTC (rev 23637) +++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-05-28 17:28:23 UTC (rev 23638) @@ -6642,7 +6642,11 @@ runtime_get_caller_creds(&ldc); - if (unlikely(ldc.uid || ldc.euid)) { +#if TARGET_OS_EMBEDDED + if (ldc.euid) { +#else + if (ldc.euid && (ldc.euid != getuid())) { +#endif return BOOTSTRAP_NOT_PRIVILEGED; }

1 0

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

28 May '08

Revision: 23637 http://trac.macosforge.org/projects/launchd/changeset/23637 Author: zarzycki(a)apple.com Date: 2008-05-28 10:21:25 -0700 (Wed, 28 May 2008) Log Message: ----------- <rdar://problem/5966453> sandbox_init: Could not set default launchd policy, err=1100 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-05-22 16:10:43 UTC (rev 23636) +++ trunk/launchd/src/launchd_core_logic.c 2008-05-28 17:21:25 UTC (rev 23637) @@ -7046,7 +7046,7 @@ return BOOTSTRAP_NO_MEMORY; } - if (unlikely(ldc->euid || ldc->uid)) { + if (ldc->euid && (ldc->euid != getuid())) { return BOOTSTRAP_NOT_PRIVILEGED; }

1 0

[23636] tags/launchd-279/
by source_changes＠macosforge.org 22 May '08

22 May '08

Revision: 23636 http://trac.macosforge.org/projects/launchd/changeset/23636 Author: zarzycki(a)apple.com Date: 2008-05-22 09:10:43 -0700 (Thu, 22 May 2008) Log Message: ----------- "Tagging launchd-279 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-279/ Copied: tags/launchd-279 (from rev 23635, trunk)

1 0

[23635] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 22 May '08

22 May '08

Revision: 23635 http://trac.macosforge.org/projects/launchd/changeset/23635 Author: zarzycki(a)apple.com Date: 2008-05-22 09:05:37 -0700 (Thu, 22 May 2008) Log Message: ----------- <rdar://problem/5954860> launchd crashed, bringing down my session Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2008-05-22 00:29:57 UTC (rev 23634) +++ trunk/launchd/src/launchd_runtime.c 2008-05-22 16:05:37 UTC (rev 23635) @@ -602,33 +602,35 @@ x_handle_kqueue(mach_port_t junk __attribute__((unused)), integer_t fd) { struct timespec ts = { 0, 0 }; - struct kevent kev[BULK_KEV_MAX]; + struct kevent *kevi, kev[BULK_KEV_MAX]; int i; bulk_kev = kev; if (launchd_assumes((bulk_kev_cnt = kevent(fd, NULL, 0, kev, BULK_KEV_MAX, &ts)) != -1)) { -#if 0 - Dl_info dli; - - if (launchd_assumes(malloc_size(kev.udata) || dladdr(kev.udata, &dli))) { -#endif for (i = 0; i < bulk_kev_cnt; i++) { log_kevent_struct(LOG_DEBUG, kev, i); } for (i = 0; i < bulk_kev_cnt; i++) { bulk_kev_i = i; - if (kev[i].filter) { - runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kev[i].ident, kev[i].filter, kev[i].fflags); - (*((kq_callback *)kev[i].udata))(kev[i].udata, &kev[i]); + kevi = &kev[i]; + + if (kevi->filter) { +#if 1 + Dl_info dli; + + 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); + (*((kq_callback *)kevi->udata))(kevi->udata, kevi); runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END); +#if 1 + } else { + log_kevent_struct(LOG_EMERG, kevi, 0); + } +#endif } } -#if 0 - } else { - log_kevent_struct(LOG_ERR, &kev, 0); - } -#endif } bulk_kev = NULL;

1 0

[23634] tags/launchd-258.16/
by source_changes＠macosforge.org 22 May '08

22 May '08

Revision: 23634 http://trac.macosforge.org/projects/launchd/changeset/23634 Author: zarzycki(a)apple.com Date: 2008-05-21 17:29:57 -0700 (Wed, 21 May 2008) Log Message: ----------- "Tagging launchd-258.16 from https://svn.macosforge.org/repository/launchd/branches/SULeopard" Added Paths: ----------- tags/launchd-258.16/ Copied: tags/launchd-258.16 (from rev 23633, branches/SULeopard)

1 0

[23633] branches/SULeopard/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 22 May '08

22 May '08

Revision: 23633 http://trac.macosforge.org/projects/launchd/changeset/23633 Author: zarzycki(a)apple.com Date: 2008-05-21 17:29:46 -0700 (Wed, 21 May 2008) Log Message: ----------- <rdar://problem/5778798> more embedded updates Modified Paths: -------------- branches/SULeopard/launchd/src/launchd_core_logic.c Modified: branches/SULeopard/launchd/src/launchd_core_logic.c =================================================================== --- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-05-22 00:28:44 UTC (rev 23632) +++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-05-22 00:29:46 UTC (rev 23633) @@ -2612,6 +2612,11 @@ if (!j->legacy_mach_job) { sipc = (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices)); +#if TARGET_OS_EMBEDDED + if (j->username && strcmp(j->username, "mobile") == 0 && strncmp(j->label, "com.apple.", strlen("com.apple.")) != 0) { + sipc = false; + } +#endif } j->checkedin = false;

1 0

[23632] tags/launchd-258.15/
by source_changes＠macosforge.org 22 May '08

22 May '08

Revision: 23632 http://trac.macosforge.org/projects/launchd/changeset/23632 Author: zarzycki(a)apple.com Date: 2008-05-21 17:28:44 -0700 (Wed, 21 May 2008) Log Message: ----------- "Tagging launchd-258.15 from https://svn.macosforge.org/repository/launchd/branches/SULeopard" Added Paths: ----------- tags/launchd-258.15/ Copied: tags/launchd-258.15 (from rev 23631, branches/SULeopard)

1 0

[23631] branches/SULeopard/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 22 May '08

22 May '08

Revision: 23631 http://trac.macosforge.org/projects/launchd/changeset/23631 Author: zarzycki(a)apple.com Date: 2008-05-21 17:27:39 -0700 (Wed, 21 May 2008) Log Message: ----------- <rdar://problem/5951129> embedded updates Modified Paths: -------------- branches/SULeopard/launchd/src/launchd_core_logic.c Modified: branches/SULeopard/launchd/src/launchd_core_logic.c =================================================================== --- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-05-21 23:25:49 UTC (rev 23630) +++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-05-22 00:27:39 UTC (rev 23631) @@ -5246,6 +5246,10 @@ struct ldcred ldc; job_t js; +#if TARGET_OS_EMBEDDED + return BOOTSTRAP_NOT_PRIVILEGED; +#endif + if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } @@ -5734,6 +5738,10 @@ struct ldcred ldc; job_t ji; +#if TARGET_OS_EMBEDDED + return BOOTSTRAP_NOT_PRIVILEGED; +#endif + if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } @@ -6020,6 +6028,10 @@ jobmgr_t jm; job_t ji; +#if TARGET_OS_EMBEDDED + return BOOTSTRAP_NOT_PRIVILEGED; +#endif + if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } @@ -6142,6 +6154,10 @@ struct ldcred ldc; jobmgr_t jmr = NULL; +#if TARGET_OS_EMBEDDED + return BOOTSTRAP_NOT_PRIVILEGED; +#endif + if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } @@ -6318,6 +6334,10 @@ jobmgr_t jm; job_t ji; +#if TARGET_OS_EMBEDDED + return BOOTSTRAP_NOT_PRIVILEGED; +#endif + if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } @@ -6608,12 +6628,19 @@ kern_return_t job_mig_set_service_policy(job_t j, pid_t target_pid, uint64_t flags, name_t target_service) { + struct ldcred ldc; job_t target_j; if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } + runtime_get_caller_creds(&ldc); + + if (unlikely(ldc.uid || ldc.euid)) { + return BOOTSTRAP_NOT_PRIVILEGED; + } + if (!job_assumes(j, (target_j = jobmgr_find_by_pid(j->mgr, target_pid, true)) != NULL)) { return BOOTSTRAP_NO_MEMORY; } @@ -6642,6 +6669,10 @@ struct ldcred ldc; job_t jr; +#if TARGET_OS_EMBEDDED + return BOOTSTRAP_NOT_PRIVILEGED; +#endif + runtime_get_caller_creds(&ldc); if (!launchd_assumes(j != NULL)) {

1 0

[23630] trunk/launchd/src
by source_changes＠macosforge.org 21 May '08

21 May '08

Revision: 23630 http://trac.macosforge.org/projects/launchd/changeset/23630 Author: zarzycki(a)apple.com Date: 2008-05-21 16:25:49 -0700 (Wed, 21 May 2008) Log Message: ----------- Misc. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/reboot2.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-05-20 20:42:28 UTC (rev 23629) +++ trunk/launchd/src/launchd_core_logic.c 2008-05-21 23:25:49 UTC (rev 23630) @@ -388,7 +388,7 @@ unsigned int timeout; unsigned int exit_timeout; int stdout_err_fd; - uint64_t sent_sigterm_time; + uint64_t sent_signal_time; uint64_t start_time; uint32_t min_run_time; uint32_t start_interval; @@ -632,7 +632,7 @@ } } - j->sent_sigterm_time = runtime_get_opaque_time(); + j->sent_signal_time = runtime_get_opaque_time(); if (newval < 0) { job_kill(j); @@ -662,7 +662,7 @@ } if (j->kill_via_shmem) { - snprintf(extralog, sizeof(extralog), ": %d remaining transactions", j->shmem->vp_shmem_transaction_cnt + 1); + snprintf(extralog, sizeof(extralog), ": %d remaining transactions", newval + 1); } else { extralog[0] = '\0'; } @@ -2403,13 +2403,13 @@ j->wait_reply_port = MACH_PORT_NULL; } - if (j->sent_sigterm_time) { - uint64_t td_sec, td_usec, td = runtime_get_nanoseconds_since(j->sent_sigterm_time); + if (j->sent_signal_time) { + uint64_t td_sec, td_usec, td = runtime_get_nanoseconds_since(j->sent_signal_time); td_sec = td / NSEC_PER_SEC; td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC; - job_log(j, LOG_INFO, "Exited %lld.%06lld seconds after %s was sent", td_sec, td_usec, signal_to_C_name(SIGTERM)); + job_log(j, LOG_INFO, "Exited %llu.%06llu seconds after the first signal was sent", td_sec, td_usec); } timeradd(&ru.ru_utime, &j->ru.ru_utime, &j->ru.ru_utime); @@ -2448,6 +2448,7 @@ j->mgr->normal_active_cnt--; } j->last_exit_status = status; + j->sent_signal_time = 0; j->sent_sigkill = false; j->sampled = false; j->sent_kill_via_shmem = false; @@ -2707,7 +2708,7 @@ * with the long SIGKILL */ if (j->sent_sigkill) { - uint64_t td = runtime_get_nanoseconds_since(j->sent_sigterm_time); + uint64_t td = runtime_get_nanoseconds_since(j->sent_signal_time); td /= NSEC_PER_SEC; td -= j->exit_timeout; @@ -2889,8 +2890,6 @@ return; } - j->sent_sigterm_time = 0; - if (likely(!j->legacy_mach_job)) { sipc = (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices)); } @@ -5251,9 +5250,10 @@ int wstatus; pid_t sp; - if (j->sampled) { + if (j->sampled || j->per_user) { return; } + j->sampled = true; if (!job_assumes(j, do_apple_internal_logging)) { @@ -7039,12 +7039,17 @@ kern_return_t job_mig_set_service_policy(job_t j, pid_t target_pid, uint64_t flags, name_t target_service) { + struct ldcred *ldc = runtime_get_caller_creds(); job_t target_j; if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } + if (unlikely(ldc->euid || ldc->uid)) { + return BOOTSTRAP_NOT_PRIVILEGED; + } + if (unlikely(!SLIST_EMPTY(&j->mspolicies))) { job_log(j, LOG_WARNING, "Jobs that have policies assigned to them may not set policies."); return BOOTSTRAP_NOT_PRIVILEGED; Modified: trunk/launchd/src/reboot2.h =================================================================== --- trunk/launchd/src/reboot2.h 2008-05-20 20:42:28 UTC (rev 23629) +++ trunk/launchd/src/reboot2.h 2008-05-21 23:25:49 UTC (rev 23630) @@ -26,6 +26,8 @@ __BEGIN_DECLS +#define RB2_FULLREBOOT 0x8000000000000000llu + /* Returns NULL on success. Not NULL on failure */ __attribute__((visibility("default"))) void *reboot2(uint64_t flags);

1 0