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

Avoid "perm stack underflow" error when logging the unknown uid error.

Browse Source
This commit is contained in:
Todd C. Miller
2013-08-07 10:13:04 -06:00
parent 23a2bdbcba
commit 972ee9a0fb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/sudoers/sudoers.c
View File

@@ -147,7 +147,6 @@ sudoers_policy_init(void *info, char * const envp[])
snl = sudo_read_nss(); snl = sudo_read_nss();
/* LDAP or NSS may modify the euid so we need to be root for the open. */ /* LDAP or NSS may modify the euid so we need to be root for the open. */
set_perms(PERM_INITIAL);
set_perms(PERM_ROOT); set_perms(PERM_ROOT);
/* Open and parse sudoers, set global defaults */ /* Open and parse sudoers, set global defaults */
@@ -523,6 +522,7 @@ static void
init_vars(char * const envp[]) init_vars(char * const envp[])
{ {
char * const * ep; char * const * ep;
bool unknown_user = false;
debug_decl(init_vars, SUDO_DEBUG_PLUGIN) debug_decl(init_vars, SUDO_DEBUG_PLUGIN)
sudoers_initlocale(setlocale(LC_ALL, NULL), def_sudoers_locale); sudoers_initlocale(setlocale(LC_ALL, NULL), def_sudoers_locale);
@@ -563,16 +563,16 @@ init_vars(char * const envp[])
/* Need to make a fake struct passwd for the call to log_fatal(). */ /* Need to make a fake struct passwd for the call to log_fatal(). */
sudo_user.pw = sudo_mkpwent(user_name, user_uid, user_gid, NULL, NULL); sudo_user.pw = sudo_mkpwent(user_name, user_uid, user_gid, NULL, NULL);
log_fatal(0, N_("unknown uid: %u"), (unsigned int) user_uid); unknown_user = true;
/* NOTREACHED */
} }
} }
/* /*
* Get group list. * Get group list and store initialize permissions.
*/ */
if (user_group_list == NULL) if (user_group_list == NULL)
user_group_list = sudo_get_grlist(sudo_user.pw); user_group_list = sudo_get_grlist(sudo_user.pw);
set_perms(PERM_INITIAL);
/* Set runas callback. */ /* Set runas callback. */
sudo_defs_table[I_RUNAS_DEFAULT].callback = cb_runas_default; sudo_defs_table[I_RUNAS_DEFAULT].callback = cb_runas_default;
@@ -584,6 +584,8 @@ init_vars(char * const envp[])
sudo_defs_table[I_MAXSEQ].callback = io_set_max_sessid; sudo_defs_table[I_MAXSEQ].callback = io_set_max_sessid;
/* It is now safe to use log_fatal() and set_perms() */ /* It is now safe to use log_fatal() and set_perms() */
if (unknown_user)
log_fatal(0, N_("unknown uid: %u"), (unsigned int) user_uid);
debug_return; debug_return;
} }