Changeset 23474

Timestamp:

12/21/07 13:06:36 (12 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5652211> Bug: launchd_core_logic.c:6375 (23433):0: (target_j = jobmgr_find_by_pid(j->mgr, target_pid, true)) != NULL

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (5 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -406 +406 @@
 static void job_log_stray_pg(job_t j);
 static void job_log_chidren_without_exec(job_t j);
-static job_t job_new_anonymous(jobmgr_t jm, pid_t anonpid);
-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 job_t job_new_anonymous(jobmgr_t jm, pid_t anonpid) __attribute__((malloc, nonnull, warn_unused_result));
+static job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv) __attribute__((malloc, nonnull(1,2), warn_unused_result));
+static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond) __attribute__((malloc, nonnull, warn_unused_result));
 static const char *job_prog(job_t j);
 static jobmgr_t job_get_bs(job_t j);
@@ -1056 +1056 @@
 
         if (!jobmgr_assumes(jm, anonpid != 0)) {
+                errno = EINVAL;
                 return NULL;
         }
@@ -1061 +1062 @@
         if (!jobmgr_assumes(jm, anonpid < 100000)) {
                 /* The kernel current defines PID_MAX to be 99999, but that define isn't exported */
+                errno = EINVAL;
                 return NULL;
         }
@@ -1075 +1077 @@
 
         if (!jobmgr_assumes(jm, kp.kp_proc.p_comm[0] != '\0')) {
+                errno = EINVAL;
                 return NULL;
         }
@@ -6503 +6506 @@
         }
 
+        target_j = jobmgr_find_by_pid(j->mgr, target_pid, true);
+
+        if (unlikely(target_j == NULL)) {
+                if (job_assumes(j, errno == ESRCH)) {
+                        job_log(j, LOG_ERR, "Could not find PID %u while trying to set Mach bootstrap service policy: %s", target_pid, target_service);
+                }
+                return BOOTSTRAP_NO_MEMORY;
+        }
+
         if (!job_assumes(j, (target_j = jobmgr_find_by_pid(j->mgr, target_pid, true)) != NULL)) {
                 return BOOTSTRAP_NO_MEMORY;