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

[23948] branches/PR-7264615/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 18 Nov '09

18 Nov '09

Revision: 23948 http://trac.macosforge.org/projects/launchd/changeset/23948 Author: dsorresso(a)apple.com Date: 2009-11-17 16:01:44 -0800 (Tue, 17 Nov 2009) Log Message: ----------- "Fix" for rdar://problem/7264615. Modified Paths: -------------- branches/PR-7264615/launchd/src/launchd_core_logic.c Modified: branches/PR-7264615/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-17 23:25:41 UTC (rev 23947) +++ branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:01:44 UTC (rev 23948) @@ -1417,7 +1417,17 @@ kp_euid, kp_uid, kp_svuid, kp_egid, kp_gid, kp_svgid, anonpid, kp.kp_proc.p_comm); } - switch (kp.kp_eproc.e_ppid) { + /* "Fix" for a problem that shouldn't even exist. + * See rdar://problem/7264615 for the symptom and rdar://problem/5020256 + * as to why this can happen. + */ + pid_t ppid = kp.kp_eproc.e_ppid; + if( !jobmgr_assumes(jm, ppid != anonpid) ) { + jobmgr_log(jm, LOG_WARNING, "Process has become its own parent through ptrace(3). It should find a different way to do whatever it's doing. Setting PPID to 0: %s", kp.kp_proc.p_comm); + ppid = 0; + } + + switch (ppid) { case 0: /* the kernel */ break; @@ -3249,7 +3259,15 @@ * * Otherwise, we wait for the death of the parent tracer and then reap, just as we * would if a job died while we were sampling it at shutdown. + * + * Note that we foolishly assume that in the process *tree* a node cannot be its + * own parent. Apparently, that is not correct. If this is the case, we forsake + * the process to its own device. Let it reap itself. */ + if( !job_assumes(j, kp.kp_eproc.e_ppid != (pid_t)kev->ident) ) { + job_log(j, LOG_WARNING, "Job is its own parent and has (somehow) exited. Leaving it to waste away."); + return; + } if( job_assumes(j, kevent_mod(kp.kp_eproc.e_ppid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, j) != -1) ) { j->tracing_pid = kp.kp_eproc.e_ppid; j->reap_after_trace = true; @@ -7325,6 +7343,12 @@ return 1; } + if( !job_assumes(j, pid_to_log == kp.kp_eproc.e_ppid) ) { + job_log(j, LOG_WARNING, "Job which is its own parent started reboot."); + snprintf(who_started_the_reboot, sizeof(who_started_the_reboot), "%s[%u]->%s[%u]->%s[%u]->...", kp.kp_proc.p_comm, pid_to_log, kp.kp_proc.p_comm, pid_to_log, kp.kp_proc.p_comm, pid_to_log); + break; + } + who_offset = strlen(who_started_the_reboot); snprintf(who_started_the_reboot + who_offset, sizeof(who_started_the_reboot) - who_offset, " %s[%u]%s", kp.kp_proc.p_comm, pid_to_log, kp.kp_eproc.e_ppid ? " ->" : "");

1 0

[23947] branches/PR-7264615/
by source_changes＠macosforge.org 17 Nov '09

17 Nov '09

Revision: 23947 http://trac.macosforge.org/projects/launchd/changeset/23947 Author: dsorresso(a)apple.com Date: 2009-11-17 15:25:41 -0800 (Tue, 17 Nov 2009) Log Message: ----------- "Branch for PR-7264615 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-7264615/ Property changes on: branches/PR-7264615 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7178164:23935-23940

1 0

[23946] branches/PR-7386864/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Nov '09

17 Nov '09

Revision: 23946 http://trac.macosforge.org/projects/launchd/changeset/23946 Author: dsorresso(a)apple.com Date: 2009-11-16 18:07:24 -0800 (Mon, 16 Nov 2009) Log Message: ----------- Fix for rdar://problem/7386864. Modified Paths: -------------- branches/PR-7386864/launchd/src/launchd_core_logic.c Modified: branches/PR-7386864/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7386864/launchd/src/launchd_core_logic.c 2009-11-17 01:28:39 UTC (rev 23945) +++ branches/PR-7386864/launchd/src/launchd_core_logic.c 2009-11-17 02:07:24 UTC (rev 23946) @@ -7673,10 +7673,10 @@ *serviceportp = machservice_port(ms); kr = BOOTSTRAP_SUCCESS; - } else if (!per_pid_lookup && (inherited_bootstrap_port != MACH_PORT_NULL)) { + } else if (inherited_bootstrap_port != MACH_PORT_NULL) { job_log(j, LOG_DEBUG, "Mach service lookup forwarded: %s", servicename); /* Clients potentially check the audit token of the reply to verify that the returned send right is trustworthy. */ - job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, 0, 0) == 0); + job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, target_pid, flags) == 0); /* The previous routine moved the reply port, we're forced to return MIG_NO_REPLY now */ return MIG_NO_REPLY; } else if (pid1_magic && j->anonymous && ldc->euid >= 500 && strcasecmp(j->mgr->name, VPROCMGR_SESSION_LOGINWINDOW) == 0) {

1 0

[23945] branches/PR-7386864/
by source_changes＠macosforge.org 17 Nov '09

17 Nov '09

Revision: 23945 http://trac.macosforge.org/projects/launchd/changeset/23945 Author: dsorresso(a)apple.com Date: 2009-11-16 17:28:39 -0800 (Mon, 16 Nov 2009) Log Message: ----------- "Branch for PR-7386864 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-7386864/ Property changes on: branches/PR-7386864 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7178164:23935-23940

1 0