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

[23392] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Sep '07

16 Sep '07

Revision: 23392 http://trac.macosforge.org/projects/launchd/changeset/23392 Author: zarzycki(a)apple.com Date: 2007-09-16 10:37:14 -0700 (Sun, 16 Sep 2007) Log Message: ----------- This happens enought that we shouldn't log it as a Bug any more... 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-09-15 00:22:39 UTC (rev 23391) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-16 17:37:14 UTC (rev 23392) @@ -1007,7 +1007,8 @@ return NULL; } - if (!jobmgr_assumes(jm, len == sizeof(kp))) { + if (len != sizeof(kp)) { + jobmgr_log(jm, LOG_DEBUG, "Tried to create an anonymous job for nonexistent PID: %u", anonpid); return NULL; }

1 0

[23391] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 15 Sep '07

15 Sep '07

Revision: 23391 http://trac.macosforge.org/projects/launchd/changeset/23391 Author: zarzycki(a)apple.com Date: 2007-09-14 17:22:39 -0700 (Fri, 14 Sep 2007) Log Message: ----------- <rdar://problem/5483598> Survive PID death during session migration 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-09-14 21:02:21 UTC (rev 23390) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-15 00:22:39 UTC (rev 23391) @@ -5915,9 +5915,10 @@ j_for_service = jobmgr_find_by_pid(jmr, target_pid, true); - if (!jobmgr_assumes(jmr, j_for_service != NULL)) { - kr = BOOTSTRAP_NO_MEMORY; - goto out; + if (!j_for_service) { + /* The PID probably exited */ + job_assumes(j, launchd_mport_deallocate(l2l_ports[l2l_i]) == KERN_SUCCESS); + continue; } if ((ms = machservice_new(j_for_service, serv_name, &l2l_ports[l2l_i], serv_perpid))) {

1 0

[23390] tags/launchd-245/
by source_changes＠macosforge.org 14 Sep '07

14 Sep '07

Revision: 23390 http://trac.macosforge.org/projects/launchd/changeset/23390 Author: zarzycki(a)apple.com Date: 2007-09-14 14:02:21 -0700 (Fri, 14 Sep 2007) Log Message: ----------- "Tagging launchd-245 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-245/ Copied: tags/launchd-245 (from rev 23389, trunk)

1 0

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

14 Sep '07

Revision: 23389 http://trac.macosforge.org/projects/launchd/changeset/23389 Author: zarzycki(a)apple.com Date: 2007-09-14 13:59:58 -0700 (Fri, 14 Sep 2007) Log Message: ----------- Better bounds checking. 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-09-14 20:25:43 UTC (rev 23388) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 20:59:58 UTC (rev 23389) @@ -351,7 +351,7 @@ uint64_t sent_sigterm_time; uint64_t start_time; uint32_t min_run_time; - unsigned int start_interval; + uint32_t start_interval; unsigned int checkedin:1, anonymous:1, debug:1, inetcompat:1, inetcompat_wait:1, ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1, importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, start_pending:1; @@ -1418,7 +1418,9 @@ case 'E': if (strcasecmp(key, LAUNCH_JOBKEY_EXITTIMEOUT) == 0) { if (value < 0) { - job_log(j, LOG_WARNING, "Exit timeout less zero. Ignoring."); + job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT); + } else if (value > UINT32_MAX) { + job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT); } else { j->exit_timeout = value; } @@ -1434,14 +1436,18 @@ case 't': case 'T': if (strcasecmp(key, LAUNCH_JOBKEY_TIMEOUT) == 0) { - if (value <= 0) { - job_log(j, LOG_WARNING, "Timeout less than or equal to zero. Ignoring."); + if (value < 0) { + job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_TIMEOUT); + } else if (value > UINT32_MAX) { + job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_TIMEOUT); } else { j->timeout = value; } } else if (strcasecmp(key, LAUNCH_JOBKEY_THROTTLEINTERVAL) == 0) { if (value < 0) { job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_THROTTLEINTERVAL); + } else if (value > UINT32_MAX) { + job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_THROTTLEINTERVAL); } else { j->min_run_time = value; } @@ -1458,14 +1464,15 @@ case 'S': if (strcasecmp(key, LAUNCH_JOBKEY_STARTINTERVAL) == 0) { if (value <= 0) { - job_log(j, LOG_WARNING, "StartInterval is not greater than zero, ignoring"); + job_log(j, LOG_WARNING, "%s is not greater than zero. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL); + } else if (value > UINT32_MAX) { + job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL); } else { runtime_add_ref(); j->start_interval = value; + + job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, value, j) != -1); } - if (-1 == kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, value, j)) { - job_log_error(j, LOG_ERR, "adding kevent timer"); - } } else if (strcasecmp(key, LAUNCH_JOBKEY_SANDBOXFLAGS) == 0) { j->seatbelt_flags = value; } @@ -5192,7 +5199,9 @@ j->ondemand = !inval; break; case VPROC_GSK_START_INTERVAL: - if ((unsigned int)inval > 0) { + if ((uint64_t)inval > UINT32_MAX) { + kr = 1; + } else if (inval) { if (j->start_interval == 0) { runtime_add_ref(); }

1 0

[23388] trunk/launchd/src
by source_changes＠macosforge.org 14 Sep '07

14 Sep '07

Revision: 23388 http://trac.macosforge.org/projects/launchd/changeset/23388 Author: zarzycki(a)apple.com Date: 2007-09-14 13:25:43 -0700 (Fri, 14 Sep 2007) Log Message: ----------- We need to finish building launchd with -Wshorten-64-to-32 someday... Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchproxy.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-09-14 18:45:29 UTC (rev 23387) +++ trunk/launchd/src/launchctl.c 2007-09-14 20:25:43 UTC (rev 23388) @@ -3054,8 +3054,8 @@ } if (fstat(fd, &sb) != -1) { - if ((junkbuf = malloc(sb.st_size)) != NULL) { - assumes(read(fd, junkbuf, sb.st_size) == sb.st_size); + if ((sb.st_size < 10*1024*1024) && (junkbuf = malloc((size_t)sb.st_size)) != NULL) { + assumes(read(fd, junkbuf, (size_t)sb.st_size) == (ssize_t)sb.st_size); free(junkbuf); } } Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-14 18:45:29 UTC (rev 23387) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 20:25:43 UTC (rev 23388) @@ -2343,7 +2343,7 @@ td /= NSEC_PER_SEC; if (j->start_time && (td < j->min_run_time) && !j->legacy_mach_job && !j->inetcompat) { - time_t respawn_delta = j->min_run_time - td; + time_t respawn_delta = j->min_run_time - (uint32_t)td; /* * We technically should ref-count throttled jobs to prevent idle exit, @@ -5898,7 +5898,7 @@ job_assumes(j, obj_at_idx = launch_data_array_get_index(out_obj_array, l2l_i)); job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_PID)); - target_pid = launch_data_get_integer(tmp); + target_pid = (pid_t)launch_data_get_integer(tmp); job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_PERPID)); serv_perpid = launch_data_get_bool(tmp); job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_NAME)); Modified: trunk/launchd/src/launchproxy.c =================================================================== --- trunk/launchd/src/launchproxy.c 2007-09-14 18:45:29 UTC (rev 23387) +++ trunk/launchd/src/launchproxy.c 2007-09-14 20:25:43 UTC (rev 23388) @@ -108,7 +108,7 @@ tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_TIMEOUT); if (tmp) - timeout.tv_sec = launch_data_get_integer(tmp); + timeout.tv_sec = (int)launch_data_get_integer(tmp); tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_PROGRAM); if (tmp)

1 0

[23387] trunk/launchd/src/SystemStarter.c
by source_changes＠macosforge.org 14 Sep '07

14 Sep '07

Revision: 23387 http://trac.macosforge.org/projects/launchd/changeset/23387 Author: zarzycki(a)apple.com Date: 2007-09-14 11:45:29 -0700 (Fri, 14 Sep 2007) Log Message: ----------- <rdar://problem/5482362> startupitem does not receive TERM signal Modified Paths: -------------- trunk/launchd/src/SystemStarter.c Modified: trunk/launchd/src/SystemStarter.c =================================================================== --- trunk/launchd/src/SystemStarter.c 2007-09-14 01:25:49 UTC (rev 23386) +++ trunk/launchd/src/SystemStarter.c 2007-09-14 18:45:29 UTC (rev 23387) @@ -47,6 +47,9 @@ static int system_starter(Action anAction, const char *aService); static void displayErrorMessages(StartupContext aStartupContext); static pid_t fwexec(const char *cmd, ...) __attribute__((sentinel)); +static void dummy_sig(int signo __attribute__((unused))) +{ +} int main(int argc, char *argv[]) @@ -60,7 +63,7 @@ EV_SET(&kev, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, 0); r = kevent(kq, &kev, 1, NULL, 0, NULL); assert(r != -1); - signal(SIGTERM, SIG_IGN); + signal(SIGTERM, dummy_sig); while ((ch = getopt(argc, argv, "gvxirdDqn?")) != -1) { switch (ch) {

1 0

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

14 Sep '07

Revision: 23386 http://trac.macosforge.org/projects/launchd/changeset/23386 Author: zarzycki(a)apple.com Date: 2007-09-13 18:25:49 -0700 (Thu, 13 Sep 2007) Log Message: ----------- <rdar://problem/5480306> Not all sockets are created equal: We need to unlink Unix domain sockets before closing them 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-09-14 00:45:13 UTC (rev 23385) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 01:25:49 UTC (rev 23386) @@ -3370,6 +3370,18 @@ unsigned int i; for (i = 0; i < sg->fd_cnt; i++) { +#if 0 + struct sockaddr_storage ss; + struct sockaddr_un *sun = (struct sockaddr_un *)&ss; + socklen_t ss_len = sizeof(ss); + + /* 5480306 */ + if (job_assumes(j, getsockname(sg->fds[i], (struct sockaddr *)&ss, &ss_len) != -1) + && job_assumes(j, ss_len > 0) && (ss.ss_family == AF_UNIX)) { + job_assumes(j, unlink(sun->sun_path) != -1); + /* We might conditionally need to delete a directory here */ + } +#endif job_assumes(j, runtime_close(sg->fds[i]) != -1); }

1 0

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

14 Sep '07

Revision: 23385 http://trac.macosforge.org/projects/launchd/changeset/23385 Author: zarzycki(a)apple.com Date: 2007-09-13 17:45:13 -0700 (Thu, 13 Sep 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-09-14 00:33:43 UTC (rev 23384) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 00:45:13 UTC (rev 23385) @@ -404,7 +404,6 @@ static job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv); static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond); static const char *job_prog(job_t j); -static pid_t job_get_pid(job_t j); static jobmgr_t job_get_bs(job_t j); static void job_kill(job_t j); static void job_uncork_fork(job_t j); @@ -4475,12 +4474,6 @@ return j->anonymous; } -pid_t -job_get_pid(job_t j) -{ - return j->p; -} - void job_force_sampletool(job_t j) { @@ -6220,7 +6213,7 @@ return VPROC_ERR_TRY_PER_USER; } - if (indataCnt == 0) { + if (!job_assumes(j, indataCnt != 0)) { return 1; } @@ -6229,12 +6222,14 @@ } jr = jobmgr_import2(j->mgr, input_obj); - - if (jr == NULL) switch (errno) { - case EEXIST: - return BOOTSTRAP_NAME_IN_USE; - default: - return BOOTSTRAP_NO_MEMORY; + + if (!job_assumes(j, jr != NULL)) { + switch (errno) { + case EEXIST: + return BOOTSTRAP_NAME_IN_USE; + default: + return BOOTSTRAP_NO_MEMORY; + } } job_reparent_hack(jr, NULL); @@ -6254,6 +6249,8 @@ return BOOTSTRAP_NO_MEMORY; } + job_assumes(jr, jr->p); + if (!job_setup_machport(jr)) { job_remove(jr); return BOOTSTRAP_NO_MEMORY; @@ -6261,7 +6258,7 @@ job_log(j, LOG_INFO, "Spawned"); - *child_pid = job_get_pid(jr); + *child_pid = jr->p; *obsvr_port = jr->j_port; mig_deallocate(indata, indataCnt);

1 0

[23384] trunk/launchd/src
by source_changes＠macosforge.org 14 Sep '07

14 Sep '07

Revision: 23384 http://trac.macosforge.org/projects/launchd/changeset/23384 Author: zarzycki(a)apple.com Date: 2007-09-13 17:33:43 -0700 (Thu, 13 Sep 2007) Log Message: ----------- More sanity checks. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-13 23:43:46 UTC (rev 23383) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 00:33:43 UTC (rev 23384) @@ -2333,6 +2333,8 @@ return; } + job_assumes(j, tnow > j->start_time); + /* * Some users adjust the wall-clock and then expect software to not notice. * Therefore, launchd must use an absolute clock instead of gettimeofday() Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2007-09-13 23:43:46 UTC (rev 23383) +++ trunk/launchd/src/libvproc.c 2007-09-14 00:33:43 UTC (rev 23384) @@ -322,6 +322,10 @@ errno = EPERM; break; case BOOTSTRAP_NO_MEMORY: errno = ENOMEM; break; + case BOOTSTRAP_NAME_IN_USE: + errno = EEXIST; break; + case 1: + errno = EIO; break; default: errno = EINVAL; break; }

1 0

[23383] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23383 http://trac.macosforge.org/projects/launchd/changeset/23383 Author: zarzycki(a)apple.com Date: 2007-09-13 16:43:46 -0700 (Thu, 13 Sep 2007) Log Message: ----------- <rdar://problem/5480998> Performance regression due to 5418922 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-09-13 22:42:46 UTC (rev 23382) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 23:43:46 UTC (rev 23383) @@ -2341,7 +2341,7 @@ td = (tnow - j->start_time) * tbi.numer / tbi.denom; td /= NSEC_PER_SEC; - if (td < j->min_run_time && !j->legacy_mach_job && !j->inetcompat) { + if (j->start_time && (td < j->min_run_time) && !j->legacy_mach_job && !j->inetcompat) { time_t respawn_delta = j->min_run_time - td; /*

1 0