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

[23339] tags/launchd-237/
by source_changes＠macosforge.org 14 Aug '07

14 Aug '07

Revision: 23339 http://trac.macosforge.org/projects/launchd/changeset/23339 Author: zarzycki(a)apple.com Date: 2007-08-14 14:14:14 -0700 (Tue, 14 Aug 2007) Log Message: ----------- "Tagging launchd-237 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-237/ Copied: tags/launchd-237 (from rev 23338, trunk)

1 0

[23338] trunk/launchd/src/launchctl.1
by source_changes＠macosforge.org 14 Aug '07

14 Aug '07

Revision: 23338 http://trac.macosforge.org/projects/launchd/changeset/23338 Author: zarzycki(a)apple.com Date: 2007-08-14 14:13:58 -0700 (Tue, 14 Aug 2007) Log Message: ----------- Update the list of known sessions. Modified Paths: -------------- trunk/launchd/src/launchctl.1 Modified: trunk/launchd/src/launchctl.1 =================================================================== --- trunk/launchd/src/launchctl.1 2007-08-14 20:13:00 UTC (rev 23337) +++ trunk/launchd/src/launchctl.1 2007-08-14 21:13:58 UTC (rev 23338) @@ -43,7 +43,7 @@ to look for jobs in a different location when using the -D flag, and allows .Nm launchctl to restrict which jobs are loaded into which session types. Currently known -session types include: Aqua, X11 and tty. +session types include: Aqua, LoginWindow, Background, StandardIO and System. .It Fl D Ar domain Look for .Xr plist 5 files ending in *.plist in the domain given. Valid domains include

1 0

[23337] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Aug '07

14 Aug '07

Revision: 23337 http://trac.macosforge.org/projects/launchd/changeset/23337 Author: zarzycki(a)apple.com Date: 2007-08-14 13:13:00 -0700 (Tue, 14 Aug 2007) Log Message: ----------- Sanity checks. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-14 18:07:16 UTC (rev 23336) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-14 20:13:00 UTC (rev 23337) @@ -1832,7 +1832,7 @@ struct machservice *ms; LIST_FOREACH(ms, &port_hash[HASH_PORT(p)], port_hash_sle) { - if (ms->port == p) { + if (ms->recv && (ms->port == p)) { return ms->job; } } @@ -4342,7 +4342,7 @@ struct machservice *ms; LIST_FOREACH(ms, &port_hash[HASH_PORT(p)], port_hash_sle) { - if (ms->port == p) { + if (ms->recv && (ms->port == p)) { break; } }

1 0

[23336] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Aug '07

14 Aug '07

Revision: 23336 http://trac.macosforge.org/projects/launchd/changeset/23336 Author: zarzycki(a)apple.com Date: 2007-08-14 11:07:16 -0700 (Tue, 14 Aug 2007) Log Message: ----------- Safety. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-14 17:53:13 UTC (rev 23335) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-14 18:07:16 UTC (rev 23336) @@ -5157,6 +5157,10 @@ struct ldcred ldc; pid_t pid_to_log; + if (!launchd_assumes(j != NULL)) { + return BOOTSTRAP_NO_MEMORY; + } + if (getpid() != 1) { return BOOTSTRAP_NOT_PRIVILEGED; }

1 0

[23335] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Aug '07

14 Aug '07

Revision: 23335 http://trac.macosforge.org/projects/launchd/changeset/23335 Author: zarzycki(a)apple.com Date: 2007-08-14 10:53:13 -0700 (Tue, 14 Aug 2007) Log Message: ----------- Sanity check. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-14 16:30:48 UTC (rev 23334) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-14 17:53:13 UTC (rev 23335) @@ -1843,7 +1843,7 @@ void job_mig_destructor(job_t j) { - if (j->unload_at_mig_return) { + if (j && j->unload_at_mig_return) { job_log(j, LOG_NOTICE, "Unloading PID %u at MIG return.", j->p); job_remove(j); }

1 0

[23334] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Aug '07

14 Aug '07

Revision: 23334 http://trac.macosforge.org/projects/launchd/changeset/23334 Author: zarzycki(a)apple.com Date: 2007-08-14 09:30:48 -0700 (Tue, 14 Aug 2007) Log Message: ----------- More sanity checks. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-14 16:06:10 UTC (rev 23333) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-14 16:30:48 UTC (rev 23334) @@ -985,11 +985,20 @@ if (!jobmgr_assumes(jm, anonpid != 0)) { return NULL; } + + if (!jobmgr_assumes(jm, anonpid < 100000)) { + /* The kernel current defines PID_MAX to be 99999, but that define isn't exported */ + return NULL; + } if (!jobmgr_assumes(jm, sysctl(mib, 4, &kp, &len, NULL, 0) != -1)) { return NULL; } + if (!jobmgr_assumes(jm, kp.kp_proc.p_comm[0] != '\0')) { + return NULL; + } + if (kp.kp_proc.p_stat == SZOMB) { jobmgr_log(jm, LOG_DEBUG, "Tried to create an anonymous job for zombie PID: %u", anonpid); zombie = "zombie"; @@ -1001,6 +1010,7 @@ break; case 1: if (getpid() != 1) { + /* we cannot possibly find a parent job_t that is useful in this function */ break; } /* fall through */

1 0

[23333] trunk/launchd/src
by source_changes＠macosforge.org 14 Aug '07

14 Aug '07

Revision: 23333 http://trac.macosforge.org/projects/launchd/changeset/23333 Author: zarzycki(a)apple.com Date: 2007-08-14 09:06:10 -0700 (Tue, 14 Aug 2007) Log Message: ----------- <rdar://problem/5321044> Bug: launchd_core_logic.c:3012 (23294):2: kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) != -1 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 2007-08-13 23:05:27 UTC (rev 23332) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-14 16:06:10 UTC (rev 23333) @@ -3044,22 +3044,31 @@ return; } - if (si->fd == -1) { - if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) { - which_path = parentdir_path; - si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY)); + do { + if (si->fd == -1) { + if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) { + which_path = parentdir_path; + si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY)); + } } - } - if (si->fd == -1) { - return job_log_error(j, LOG_ERR, "Watchpath monitoring failed on \"%s\"", which_path); - } + if (si->fd == -1) { + return job_log_error(j, LOG_ERR, "Watchpath monitoring failed on \"%s\"", which_path); + } - job_log(j, LOG_DEBUG, "Watching Vnode: %d", si->fd); - if (!job_assumes(j, kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) != -1)) { - /* Extra logging for 5321044 */ - job_log(j, LOG_ERR, "Bug (5321044): si->why == %u si->fd == %d fflags = 0x%x j == %p", si->why, si->fd, fflags, j); - } + job_log(j, LOG_DEBUG, "Watching Vnode: %d", si->fd); + + if (kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) == -1) { + /* + * The FD can be revoked between the open() and kevent(). + * This is similar to the inability for kevents to be + * attached to short lived zombie processes after fork() + * but before kevent(). + */ + job_assumes(j, runtime_close(si->fd) == 0); + si->fd = -1; + } + } while (si->fd == -1); } void Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-08-13 23:05:27 UTC (rev 23332) +++ trunk/launchd/src/launchd_runtime.c 2007-08-14 16:06:10 UTC (rev 23333) @@ -720,22 +720,17 @@ r = kevent(mainkq, &kev, 1, &kev, 1, NULL); -#define BUG_5321044_RESEARCH 1 -#if BUG_5321044_RESEARCH - if (r != 1) { - runtime_syslog(LOG_ERR, "Bug (5321044): kevent_mod() == %d", r); + if (!launchd_assumes(r == 1)) { return -1; } if (launchd_assumes(kev.flags & EV_ERROR)) { - if ((flags & EV_ADD) && kev.data) { - runtime_syslog(LOG_ERR, "Bug (5321044): See next line."); + if ((flags & EV_ADD) && !launchd_assumes(kev.data == 0)) { log_kevent_struct(LOG_ERR, &kev, 0); errno = kev.data; return -1; } } -#endif return r; }

1 0

[23332] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 13 Aug '07

13 Aug '07

Revision: 23332 http://trac.macosforge.org/projects/launchd/changeset/23332 Author: zarzycki(a)apple.com Date: 2007-08-13 16:05:27 -0700 (Mon, 13 Aug 2007) Log Message: ----------- Correctness. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-08-07 22:13:10 UTC (rev 23331) +++ trunk/launchd/src/launchd_runtime.c 2007-08-13 23:05:27 UTC (rev 23332) @@ -731,6 +731,8 @@ if ((flags & EV_ADD) && kev.data) { runtime_syslog(LOG_ERR, "Bug (5321044): See next line."); log_kevent_struct(LOG_ERR, &kev, 0); + errno = kev.data; + return -1; } } #endif

1 0

[23331] tags/launchd-236/
by source_changes＠macosforge.org 07 Aug '07

07 Aug '07

Revision: 23331 http://trac.macosforge.org/projects/launchd/changeset/23331 Author: zarzycki(a)apple.com Date: 2007-08-07 15:13:10 -0700 (Tue, 07 Aug 2007) Log Message: ----------- "Tagging launchd-236 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-236/ Copied: tags/launchd-236 (from rev 23330, trunk)

1 0

[23330] trunk/launchd/src
by source_changes＠macosforge.org 07 Aug '07

07 Aug '07

Revision: 23330 http://trac.macosforge.org/projects/launchd/changeset/23330 Author: zarzycki(a)apple.com Date: 2007-08-07 09:29:30 -0700 (Tue, 07 Aug 2007) Log Message: ----------- Bug 5321044 is rare. I suspect that the kernel is at fault, but I need more data from those few who experience it in the wild. 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 2007-08-06 15:24:48 UTC (rev 23329) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-07 16:29:30 UTC (rev 23330) @@ -3058,7 +3058,7 @@ job_log(j, LOG_DEBUG, "Watching Vnode: %d", si->fd); if (!job_assumes(j, kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) != -1)) { /* Extra logging for 5321044 */ - job_log(j, LOG_ERR, "Bug (5321044): si->fd == %d fflags = 0x%x j == %p", si->fd, fflags, j); + job_log(j, LOG_ERR, "Bug (5321044): si->why == %u si->fd == %d fflags = 0x%x j == %p", si->why, si->fd, fflags, j); } } Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-08-06 15:24:48 UTC (rev 23329) +++ trunk/launchd/src/launchd_runtime.c 2007-08-07 16:29:30 UTC (rev 23330) @@ -698,6 +698,7 @@ kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata) { struct kevent kev; + int r; switch (filter) { case EVFILT_READ: @@ -708,6 +709,8 @@ break; } + flags |= EV_RECEIPT; + if (flags & EV_ADD && !launchd_assumes(udata != NULL)) { errno = EINVAL; return -1; @@ -715,7 +718,24 @@ EV_SET(&kev, ident, filter, flags, fflags, data, udata); - return kevent(mainkq, &kev, 1, NULL, 0, NULL); + r = kevent(mainkq, &kev, 1, &kev, 1, NULL); + +#define BUG_5321044_RESEARCH 1 +#if BUG_5321044_RESEARCH + if (r != 1) { + runtime_syslog(LOG_ERR, "Bug (5321044): kevent_mod() == %d", r); + return -1; + } + + if (launchd_assumes(kev.flags & EV_ERROR)) { + if ((flags & EV_ADD) && kev.data) { + runtime_syslog(LOG_ERR, "Bug (5321044): See next line."); + log_kevent_struct(LOG_ERR, &kev, 0); + } + } +#endif + + return r; } boolean_t

1 0