April 2008 - launchd-changes - lists.macosforge.org

[23584] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 02 Apr '08

02 Apr '08

Revision: 23584 http://trac.macosforge.org/projects/launchd/changeset/23584 Author: zarzycki(a)apple.com Date: 2008-04-02 10:48:25 -0700 (Wed, 02 Apr 2008) Log Message: ----------- <rdar://problem/5201578> Work around Unix (environmental variables and credentials are copied, not referenced) Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-02 17:31:16 UTC (rev 23583) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-02 17:48:25 UTC (rev 23584) @@ -428,6 +428,7 @@ 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_postfork_test_user(job_t j); static void job_log_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); @@ -3109,6 +3110,77 @@ } void +job_postfork_test_user(job_t j) +{ + /* This function is all about 5201578 */ + + const char *shell_env_var = getenv("SHELL"); + const char *home_env_var = getenv("HOME"); + const char *user_env_var = getenv("USER"); + const char *logname_env_var = getenv("LOGNAME"); + uid_t tmp_uid, local_uid = getuid(); + gid_t tmp_gid, local_gid = getgid(); + char shellpath[PATH_MAX]; + char homedir[PATH_MAX]; + char loginname[2000]; + struct passwd *pwe; + + + if (!job_assumes(j, shell_env_var && home_env_var && user_env_var && logname_env_var + && strcmp(user_env_var, logname_env_var) == 0)) { + goto out_bad; + } + + if ((pwe = getpwnam(user_env_var)) == NULL) { + job_log(j, LOG_ERR, "The account \"%s\" has been deleted out from under us!", user_env_var); + goto out_bad; + } + + /* + * We must copy the results of getpw*(). + * + * Why? Because subsequent API calls may call getpw*() as a part of + * their implementation. Since getpw*() returns a [now thread scoped] + * global, we must therefore cache the results before continuing. + */ + + tmp_uid = pwe->pw_uid; + tmp_gid = pwe->pw_gid; + + strlcpy(shellpath, pwe->pw_shell, sizeof(shellpath)); + strlcpy(loginname, pwe->pw_name, sizeof(loginname)); + strlcpy(homedir, pwe->pw_dir, sizeof(homedir)); + + if (strcmp(shellpath, shell_env_var) != 0) { + job_log(j, LOG_ERR, "The %s environmental variable changed out from under us!", "SHELL"); + goto out_bad; + } + if (strcmp(loginname, logname_env_var) != 0) { + job_log(j, LOG_ERR, "The %s environmental variable changed out from under us!", "USER"); + goto out_bad; + } + if (strcmp(homedir, home_env_var) != 0) { + job_log(j, LOG_ERR, "The %s environmental variable changed out from under us!", "HOME"); + goto out_bad; + } + if (local_uid != tmp_uid) { + job_log(j, LOG_ERR, "The %cID of the account (%u) changed out from under us (%u)!", + 'U', tmp_uid, local_uid); + goto out_bad; + } + if (local_gid != tmp_gid) { + job_log(j, LOG_ERR, "The %cID of the account (%u) changed out from under us (%u)!", + 'G', tmp_gid, local_gid); + goto out_bad; + } + + return; +out_bad: + job_assumes(j, runtime_kill(getppid(), SIGTERM) != -1); + _exit(EXIT_FAILURE); +} + +void job_postfork_become_user(job_t j) { char loginname[2000]; @@ -3121,7 +3193,7 @@ uid_t desired_uid = -1; if (getuid() != 0) { - return; + return job_postfork_test_user(j); } /*

1 0

[23583] trunk/launchd/src/StartupItems.c
by source_changes＠macosforge.org 02 Apr '08

02 Apr '08

Revision: 23583 http://trac.macosforge.org/projects/launchd/changeset/23583 Author: zarzycki(a)apple.com Date: 2008-04-02 10:31:16 -0700 (Wed, 02 Apr 2008) Log Message: ----------- <rdar://problem/5835665> 10A41: SystemStarter crashes when FORTIFY is enabled Modified Paths: -------------- trunk/launchd/src/StartupItems.c Modified: trunk/launchd/src/StartupItems.c =================================================================== --- trunk/launchd/src/StartupItems.c 2008-04-02 16:43:05 UTC (rev 23582) +++ trunk/launchd/src/StartupItems.c 2008-04-02 17:31:16 UTC (rev 23583) @@ -286,7 +286,7 @@ while ((aState = NSGetNextSearchPathEnumeration(aState, aPath))) { DIR *aDirectory; - strcpy(aPath + strlen(aPath), kStartupItemsPath); + strlcat(aPath, kStartupItemsPath, sizeof(aPath)); ++aDomainIndex; /* 5485016 @@ -923,29 +923,18 @@ anError = 0; } else { CFStringRef aBundlePathString = CFDictionaryGetValue(anItem, kBundlePathKey); - size_t aBundlePathCLength = - CFStringGetMaximumSizeForEncoding(CFStringGetLength(aBundlePathString), kCFStringEncodingUTF8) + 1; - char *aBundlePath = (char *)malloc(aBundlePathCLength); - char anExecutable[PATH_MAX] = ""; + char aBundlePath[PATH_MAX]; + char anExecutable[PATH_MAX]; + char *tmp; - if (!aBundlePath) { - syslog(LOG_EMERG, "malloc() failed; out of memory while running item %s", aBundlePathString); - return (anError); - } - if (!CFStringGetCString(aBundlePathString, aBundlePath, aBundlePathCLength, kCFStringEncodingUTF8)) { + if (!CFStringGetCString(aBundlePathString, aBundlePath, sizeof(aBundlePath), kCFStringEncodingUTF8)) { CF_syslog(LOG_EMERG, CFSTR("Internal error while running item %@"), aBundlePathString); return (anError); } /* Compute path to excecutable */ - { - char *tmp; - strncpy(anExecutable, aBundlePath, sizeof(anExecutable)); /* .../foo */ - tmp = rindex(anExecutable, '/'); /* /foo */ - strncat(anExecutable, tmp, strlen(tmp)); /* .../foo/foo */ - } + tmp = rindex(aBundlePath, '/'); + snprintf(anExecutable, sizeof(anExecutable), "%s%s", aBundlePath, tmp); - free(aBundlePath); - /** * Run the bundle **/

1 0

[23582] trunk/launchd/src/libvproc_internal.h
by source_changes＠macosforge.org 02 Apr '08

02 Apr '08

Revision: 23582 http://trac.macosforge.org/projects/launchd/changeset/23582 Author: zarzycki(a)apple.com Date: 2008-04-02 09:43:05 -0700 (Wed, 02 Apr 2008) Log Message: ----------- <rdar://problem/5813180> 10A35: Stalled NetInstall of 10A35 Modified Paths: -------------- trunk/launchd/src/libvproc_internal.h Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2008-03-28 23:01:07 UTC (rev 23581) +++ trunk/launchd/src/libvproc_internal.h 2008-04-02 16:43:05 UTC (rev 23582) @@ -94,7 +94,7 @@ const char *msg; uint64_t msg_offset; }; - size_t obj_sz; + uint64_t obj_sz; char data[0]; };

1 0