isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It is possible for get_user_info() to fail for reasons other than

Browse Source 
ENOMEM so print the warning message there rather than in main().
This commit is contained in:
Todd C. Miller
2016-08-31 05:47:36 -06:00
parent edcb137f60
commit ef4e808103
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/sudo.c
View File

@@ -201,7 +201,7 @@ main(int argc, char *argv[], char *envp[])
/* Fill in user_info with user name, uid, cwd, etc. */ /* Fill in user_info with user name, uid, cwd, etc. */
if ((user_info = get_user_info(&user_details)) == NULL) if ((user_info = get_user_info(&user_details)) == NULL)
sudo_fatalx(U_("%s: %s"), __func__, U_("unable to allocate memory")); exit(EXIT_FAILURE); /* get_user_info printed error message */
/* Disable core dumps if not enabled in sudo.conf. */ /* Disable core dumps if not enabled in sudo.conf. */
disable_coredumps(); disable_coredumps();
@@ -267,7 +267,7 @@ main(int argc, char *argv[], char *envp[])
if (ok != 1) { if (ok != 1) {
if (ok == -2) if (ok == -2)
usage(1); usage(1);
exit(1); /* plugin printed error message */ exit(EXIT_FAILURE); /* plugin printed error message */
} }
/* Reset nargv/nargc based on argv_out. */ /* Reset nargv/nargc based on argv_out. */
/* XXX - leaks old nargv in shell mode */ /* XXX - leaks old nargv in shell mode */
@@ -500,7 +500,7 @@ get_user_info(struct user_details *ud)
/* XXX - bound check number of entries */ /* XXX - bound check number of entries */
user_info = reallocarray(NULL, 32, sizeof(char *)); user_info = reallocarray(NULL, 32, sizeof(char *));
if (user_info == NULL) if (user_info == NULL)
goto bad; goto oom;
ud->pid = getpid(); ud->pid = getpid();
ud->ppid = getppid(); ud->ppid = getppid();
@@ -524,7 +524,7 @@ get_user_info(struct user_details *ud)
user_info[i] = sudo_new_key_val("user", pw->pw_name); user_info[i] = sudo_new_key_val("user", pw->pw_name);
if (user_info[i] == NULL) if (user_info[i] == NULL)
goto bad; goto oom;
ud->username = user_info[i] + sizeof("user=") - 1; ud->username = user_info[i] + sizeof("user=") - 1;
/* Stash user's shell for use with the -s flag; don't pass to plugin. */ /* Stash user's shell for use with the -s flag; don't pass to plugin. */
@@ -532,26 +532,26 @@ get_user_info(struct user_details *ud)
ud->shell = pw->pw_shell[0] ? pw->pw_shell : _PATH_SUDO_BSHELL; ud->shell = pw->pw_shell[0] ? pw->pw_shell : _PATH_SUDO_BSHELL;
} }
if ((ud->shell = strdup(ud->shell)) == NULL) if ((ud->shell = strdup(ud->shell)) == NULL)
goto bad; goto oom;
if (asprintf(&user_info[++i], "pid=%d", (int)ud->pid) == -1) if (asprintf(&user_info[++i], "pid=%d", (int)ud->pid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "ppid=%d", (int)ud->ppid) == -1) if (asprintf(&user_info[++i], "ppid=%d", (int)ud->ppid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "pgid=%d", (int)ud->pgid) == -1) if (asprintf(&user_info[++i], "pgid=%d", (int)ud->pgid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "tcpgid=%d", (int)ud->tcpgid) == -1) if (asprintf(&user_info[++i], "tcpgid=%d", (int)ud->tcpgid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "sid=%d", (int)ud->sid) == -1) if (asprintf(&user_info[++i], "sid=%d", (int)ud->sid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "uid=%u", (unsigned int)ud->uid) == -1) if (asprintf(&user_info[++i], "uid=%u", (unsigned int)ud->uid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "euid=%u", (unsigned int)ud->euid) == -1) if (asprintf(&user_info[++i], "euid=%u", (unsigned int)ud->euid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "gid=%u", (unsigned int)ud->gid) == -1) if (asprintf(&user_info[++i], "gid=%u", (unsigned int)ud->gid) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "egid=%u", (unsigned int)ud->egid) == -1) if (asprintf(&user_info[++i], "egid=%u", (unsigned int)ud->egid) == -1)
goto bad; goto oom;
if ((cp = get_user_groups(ud)) != NULL) if ((cp = get_user_groups(ud)) != NULL)
user_info[++i] = cp; user_info[++i] = cp;
@@ -559,33 +559,35 @@ get_user_info(struct user_details *ud)
if (getcwd(path, sizeof(path)) != NULL) { if (getcwd(path, sizeof(path)) != NULL) {
user_info[++i] = sudo_new_key_val("cwd", path); user_info[++i] = sudo_new_key_val("cwd", path);
if (user_info[i] == NULL) if (user_info[i] == NULL)
goto bad; goto oom;
ud->cwd = user_info[i] + sizeof("cwd=") - 1; ud->cwd = user_info[i] + sizeof("cwd=") - 1;
} }
if (get_process_ttyname(path, sizeof(path)) != NULL) { if (get_process_ttyname(path, sizeof(path)) != NULL) {
user_info[++i] = sudo_new_key_val("tty", path); user_info[++i] = sudo_new_key_val("tty", path);
if (user_info[i] == NULL) if (user_info[i] == NULL)
goto bad; goto oom;
ud->tty = user_info[i] + sizeof("tty=") - 1; ud->tty = user_info[i] + sizeof("tty=") - 1;
} else { } else {
/* tty may not always be present */ /* tty may not always be present */
if (errno != ENOENT) if (errno != ENOENT) {
sudo_warn(U_("unable to determine tty"));
goto bad; goto bad;
} }
}
cp = sudo_gethostname(); cp = sudo_gethostname();
user_info[++i] = sudo_new_key_val("host", cp ? cp : "localhost"); user_info[++i] = sudo_new_key_val("host", cp ? cp : "localhost");
free(cp); free(cp);
if (user_info[i] == NULL) if (user_info[i] == NULL)
goto bad; goto oom;
ud->host = user_info[i] + sizeof("host=") - 1; ud->host = user_info[i] + sizeof("host=") - 1;
sudo_get_ttysize(&ud->ts_lines, &ud->ts_cols); sudo_get_ttysize(&ud->ts_lines, &ud->ts_cols);
if (asprintf(&user_info[++i], "lines=%d", ud->ts_lines) == -1) if (asprintf(&user_info[++i], "lines=%d", ud->ts_lines) == -1)
goto bad; goto oom;
if (asprintf(&user_info[++i], "cols=%d", ud->ts_cols) == -1) if (asprintf(&user_info[++i], "cols=%d", ud->ts_cols) == -1)
goto bad; goto oom;
user_info[++i] = NULL; user_info[++i] = NULL;
@@ -594,6 +596,8 @@ get_user_info(struct user_details *ud)
goto bad; goto bad;
debug_return_ptr(user_info); debug_return_ptr(user_info);
oom:
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
bad: bad:
while (i--) while (i--)
free(user_info[i]); free(user_info[i]);
@@ -730,7 +734,7 @@ command_info_to_details(char * const info[], struct command_details *details)
details->ngroups = sudo_parse_gids(cp, NULL, &details->groups); details->ngroups = sudo_parse_gids(cp, NULL, &details->groups);
/* sudo_parse_gids() will print a warning on error. */ /* sudo_parse_gids() will print a warning on error. */
if (details->ngroups == -1) if (details->ngroups == -1)
exit(1); exit(EXIT_FAILURE); /* XXX */
break; break;
} }
if (strncmp("runas_uid=", info[i], sizeof("runas_uid=") - 1) == 0) { if (strncmp("runas_uid=", info[i], sizeof("runas_uid=") - 1) == 0) {