launchd-258.18.tar.gz

diff --git a/launchd/src/launchctl.c b/launchd/src/launchctl.c
index f62bfb844e9d8f8dbe1a2ea25315035b4db77000..df7c67fe0494f821fd0268b144077e09042146de 100644 (file)
--- a/launchd/src/launchctl.c
+++ b/launchd/src/launchctl.c
@@ -18,7 +18,7 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 

-static const char *const __rcs_file_version__ = "$Revision: 23566 $";
+static const char *const __rcs_file_version__ = "$Revision: 23642 $";

 
 #include "liblaunch_public.h"
 #include "liblaunch_private.h"
 
 #include "liblaunch_public.h"
 #include "liblaunch_private.h"


@@ -69,7 +69,6 @@ static const char *const __rcs_file_version__ = "$Revision: 23566 $";
 #include <readline/history.h>
 #include <dns_sd.h>
 #include <paths.h>
 #include <readline/history.h>
 #include <dns_sd.h>
 #include <paths.h>

-#include <utmp.h>

 #include <utmpx.h>
 #include <bootfiles.h>
 #include <sysexits.h>
 #include <utmpx.h>
 #include <bootfiles.h>
 #include <sysexits.h>


@@ -2805,7 +2804,10 @@ out:
 #if TARGET_OS_EMBEDDED
        if (path_check("/etc/fstab")) {
                const char *mount_tool[] = { "mount", "-vat", "nonfs", NULL };
 #if TARGET_OS_EMBEDDED
        if (path_check("/etc/fstab")) {
                const char *mount_tool[] = { "mount", "-vat", "nonfs", NULL };

-               assumes(fwexec(mount_tool, true) != -1);
+               if (!assumes(fwexec(mount_tool, true) != -1)) {
+                       assumes(fwexec(nvram_tool, true) != -1);
+                       assumes(reboot(RB_AUTOBOOT) != -1);
+               }

        } else
 #endif
        {
        } else
 #endif
        {

diff --git a/launchd/src/launchd_core_logic.c b/launchd/src/launchd_core_logic.c
index ea6f608137057572c8662cfc2569297670bdca44..e1f82c2035bb20fc4f2a0ee8e11004c90901a5b0 100644 (file)
--- a/launchd/src/launchd_core_logic.c
+++ b/launchd/src/launchd_core_logic.c
@@ -16,7 +16,7 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 

-static const char *const __rcs_file_version__ = "$Revision: 23585 $";
+static const char *const __rcs_file_version__ = "$Revision: 23646 $";

 
 #include "config.h"
 #include "launchd_core_logic.h"
 
 #include "config.h"
 #include "launchd_core_logic.h"


@@ -420,6 +420,7 @@ static void job_setup_attributes(job_t j);
 static bool job_setup_machport(job_t j);
 static void job_setup_fd(job_t j, int target_fd, const char *path, int flags);
 static void job_postfork_become_user(job_t j);
 static bool job_setup_machport(job_t j);
 static void job_setup_fd(job_t j, int target_fd, const char *path, int flags);
 static void job_postfork_become_user(job_t j);

+static void job_enable_audit_for_user(job_t j, uid_t u, char *name);

 static void job_find_and_blame_pids_with_weird_uids(job_t j);
 static void job_force_sampletool(job_t j);
 static void job_setup_exception_port(job_t j, task_t target_task);
 static void job_find_and_blame_pids_with_weird_uids(job_t j);
 static void job_force_sampletool(job_t j);
 static void job_setup_exception_port(job_t j, task_t target_task);


@@ -2259,6 +2260,8 @@ job_reap(job_t j)
        }
        j->last_exit_status = status;
        j->sent_sigkill = false;
        }
        j->last_exit_status = status;
        j->sent_sigkill = false;

+       j->lastlookup = NULL;
+       j->lastlookup_gennum = 0;

        j->p = 0;
 
        /*
        j->p = 0;
 
        /*


@@ -2610,6 +2613,11 @@ job_start(job_t j)
 
        if (!j->legacy_mach_job) {
                sipc = (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices));
 
        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;
        }
 
        j->checkedin = false;


@@ -2917,6 +2925,28 @@ out:
        free(kp);
 }
 
        free(kp);
 }
 

+void
+job_enable_audit_for_user(job_t j, uid_t u, char *name)
+{
+       auditinfo_t auinfo = {
+               .ai_auid = u,
+               .ai_asid = j->p,
+       };
+       long au_cond;
+
+       if (!job_assumes(j, auditon(A_GETCOND, &au_cond, sizeof(long)) == 0)) {
+               _exit(EXIT_FAILURE);
+       }
+
+       if (au_cond != AUC_NOAUDIT) {
+               if (!job_assumes(j, au_user_mask(name, &auinfo.ai_mask) == 0)) {
+                       _exit(EXIT_FAILURE);
+               } else if (!job_assumes(j, setaudit(&auinfo) == 0)) {
+                       _exit(EXIT_FAILURE);
+               }
+       }
+}
+

 void
 job_postfork_become_user(job_t j)
 {
 void
 job_postfork_become_user(job_t j)
 {


@@ -2994,6 +3024,8 @@ job_postfork_become_user(job_t j)
                desired_gid = gre->gr_gid;
        }
 
                desired_gid = gre->gr_gid;
        }
 

+       job_enable_audit_for_user(j, desired_uid, loginname);
+

        if (!job_assumes(j, setlogin(loginname) != -1)) {
                _exit(EXIT_FAILURE);
        }
        if (!job_assumes(j, setlogin(loginname) != -1)) {
                _exit(EXIT_FAILURE);
        }


@@ -5244,6 +5276,10 @@ job_mig_create_server(job_t j, cmd_t server_cmd, uid_t server_uid, boolean_t on_
        struct ldcred ldc;
        job_t js;
 
        struct ldcred ldc;
        job_t js;
 

+#if TARGET_OS_EMBEDDED
+       return BOOTSTRAP_NOT_PRIVILEGED;
+#endif
+

        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }
        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }


@@ -5732,6 +5768,10 @@ job_mig_lookup_per_user_context(job_t j, uid_t which_user, mach_port_t *up_cont)
        struct ldcred ldc;
        job_t ji;
 
        struct ldcred ldc;
        job_t ji;
 

+#if TARGET_OS_EMBEDDED
+       return BOOTSTRAP_NOT_PRIVILEGED;
+#endif
+

        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }
        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }


@@ -5942,7 +5982,7 @@ job_mig_look_up2(job_t j, name_t servicename, mach_port_t *serviceportp, mach_ms
                ms = jobmgr_lookup_service(j->mgr, servicename, true, 0);
        }
 
                ms = jobmgr_lookup_service(j->mgr, servicename, true, 0);
        }
 

-       if (ms && machservice_hidden(ms) && !job_active(machservice_job(ms))) {
+       if (ms && machservice_hidden(ms) && !machservice_active(ms)) {

                ms = NULL;
        } else if (ms && ms->per_user_hack) {
                ms = NULL;
                ms = NULL;
        } else if (ms && ms->per_user_hack) {
                ms = NULL;


@@ -6018,6 +6058,10 @@ job_mig_info(job_t j, name_array_t *servicenamesp, unsigned int *servicenames_cn
        jobmgr_t jm;
        job_t ji;
 
        jobmgr_t jm;
        job_t ji;
 

+#if TARGET_OS_EMBEDDED
+       return BOOTSTRAP_NOT_PRIVILEGED;
+#endif
+

        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }
        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }


@@ -6140,6 +6184,10 @@ job_mig_move_subset(job_t j, mach_port_t target_subset, name_t session_type)
        struct ldcred ldc;
        jobmgr_t jmr = NULL;
 
        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;
        }
        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }


@@ -6316,6 +6364,10 @@ job_mig_take_subset(job_t j, mach_port_t *reqport, mach_port_t *rcvright,
        jobmgr_t jm;
        job_t ji;
 
        jobmgr_t jm;
        job_t ji;
 

+#if TARGET_OS_EMBEDDED
+       return BOOTSTRAP_NOT_PRIVILEGED;
+#endif
+

        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }
        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }


@@ -6606,12 +6658,23 @@ job_mig_uncork_fork(job_t j)
 kern_return_t
 job_mig_set_service_policy(job_t j, pid_t target_pid, uint64_t flags, name_t target_service)
 {
 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;
        }
 
        job_t target_j;
 
        if (!launchd_assumes(j != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }
 

+       runtime_get_caller_creds(&ldc);
+
+#if TARGET_OS_EMBEDDED
+       if (ldc.euid) {
+#else
+       if (ldc.euid && (ldc.euid != getuid())) {
+#endif
+               return BOOTSTRAP_NOT_PRIVILEGED;
+       }
+

        if (!job_assumes(j, (target_j = jobmgr_find_by_pid(j->mgr, target_pid, true)) != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }
        if (!job_assumes(j, (target_j = jobmgr_find_by_pid(j->mgr, target_pid, true)) != NULL)) {
                return BOOTSTRAP_NO_MEMORY;
        }


@@ -6640,6 +6703,10 @@ job_mig_spawn(job_t j, vm_offset_t indata, mach_msg_type_number_t indataCnt, pid
        struct ldcred ldc;
        job_t jr;
 
        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)) {
        runtime_get_caller_creds(&ldc);
 
        if (!launchd_assumes(j != NULL)) {

diff --git a/launchd/src/launchd_runtime_kill.c b/launchd/src/launchd_runtime_kill.c
index 0907748d4a094dda7629257ac73a3de21cd7a2f0..ebed8f05ada28f14f4b12b9c8c7f7320ff3e6ab6 100644 (file)
--- a/launchd/src/launchd_runtime_kill.c
+++ b/launchd/src/launchd_runtime_kill.c
@@ -18,36 +18,27 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 

-#if !defined(__LP64__) && !defined(__arm__)
-#define _NONSTD_SOURCE 1
-#define old_kill(x, y) kill(x, y)
-#define old_killpg(x, y) killpg(x, y)
-#else
-/* ??? No blessed way to get the old behavior */
-extern int __kill(int, int, int);
-#define old_kill(x, y) __kill(x, y, 0)
-#define old_killpg(x, y) __kill(-(x), y, 0)
-#endif
+#include <sys/syscall.h>
+#include <unistd.h>

 #include <signal.h>
 
 #include "launchd_runtime_kill.h"
 
 #include <signal.h>
 
 #include "launchd_runtime_kill.h"
 

-/*
- * POSIX defines consistency over correctness, and consequently kill/killpg now
- * returns EPERM instead of ESRCH.
- *
- * I've filed 5487498 to get a non-portable kill() variant, but for now,
- * defining _NONSTD_SOURCE gets us the old behavior.
- */
-

 int
 runtime_kill(pid_t pid, int sig)
 {
 int
 runtime_kill(pid_t pid, int sig)
 {

-       return old_kill(pid, sig);
+       /*
+        * POSIX defines consistency over correctness, and consequently
+        * kill/killpg now returns EPERM instead of ESRCH.
+        *
+        * I've filed 5487498 to get a non-portable kill().
+        * We'll regretfully take advantage of implementation details for now.
+        */
+       return syscall(SYS_kill, pid, sig, 0);

 }
 
 int
 runtime_killpg(pid_t pgrp, int sig)
 {
 }
 
 int
 runtime_killpg(pid_t pgrp, int sig)
 {

-       return old_killpg(pgrp, sig);
+       return runtime_kill(-pgrp, sig);

 }
 }