In sudoers_main() avoid setting rval prematurely. Prevents a crash

when auditing fails after successfully authenticating.  Bug #756
This commit is contained in:
Todd C. Miller
2016-09-05 19:44:46 -06:00
parent 43084d8f91
commit b80309e6d8

View File

@@ -415,13 +415,19 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
goto bad;
/* Require a password if sudoers says so. */
rval = check_user(validated, sudo_mode);
if (rval != true) {
switch (check_user(validated, sudo_mode)) {
case true:
/* user authenticated successfully. */
break;
case false:
/* Note: log_denial() calls audit for us. */
if (!ISSET(validated, VALIDATE_SUCCESS)) {
if (!log_denial(validated, false))
rval = -1;
goto done;
}
goto bad;
default:
/* some other error, rval is -1. */
goto done;
}