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

Reset valid_flags to MODE_NONINTERACTIVE for sudoedit.

Browse Source 
This is consistent with how the -e option is handled.
Also reject -H and -P flags for sudoedit as was done in sudo 1.7.
Found by Qualys, this is part of the fix for CVE-2021-3156.
This commit is contained in:
Todd C. Miller
2021-01-23 08:43:59 -07:00
parent 3b7977a42c
commit b301b46b79
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/parse_args.c
View File

@@ -117,7 +117,10 @@ struct environment {
/* /*
* Default flags allowed when running a command. * Default flags allowed when running a command.
*/ */
#define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_SHELL) #define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_PRESERVE_GROUPS|MODE_SHELL)
#define EDIT_VALID_FLAGS MODE_NONINTERACTIVE
#define LIST_VALID_FLAGS (MODE_NONINTERACTIVE|MODE_LONG_LIST)
#define VALIDATE_VALID_FLAGS MODE_NONINTERACTIVE
/* Option number for the --host long option due to ambiguity of the -h flag. */ /* Option number for the --host long option due to ambiguity of the -h flag. */
#define OPT_HOSTNAME 256 #define OPT_HOSTNAME 256
@@ -262,6 +265,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
progname = "sudoedit"; progname = "sudoedit";
mode = MODE_EDIT; mode = MODE_EDIT;
sudo_settings[ARG_SUDOEDIT].value = "true"; sudo_settings[ARG_SUDOEDIT].value = "true";
valid_flags = EDIT_VALID_FLAGS;
} }
/* Load local IP addresses and masks. */ /* Load local IP addresses and masks. */
@@ -365,7 +369,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
usage_excl(); usage_excl();
mode = MODE_EDIT; mode = MODE_EDIT;
sudo_settings[ARG_SUDOEDIT].value = "true"; sudo_settings[ARG_SUDOEDIT].value = "true";
valid_flags = MODE_NONINTERACTIVE; valid_flags = EDIT_VALID_FLAGS;
break; break;
case 'g': case 'g':
assert(optarg != NULL); assert(optarg != NULL);
@@ -377,6 +381,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
break; break;
case 'H': case 'H':
sudo_settings[ARG_SET_HOME].value = "true"; sudo_settings[ARG_SET_HOME].value = "true";
SET(flags, MODE_RESET_HOME);
break; break;
case 'h': case 'h':
if (optarg == NULL) { if (optarg == NULL) {
@@ -431,7 +436,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
usage_excl(); usage_excl();
} }
mode = MODE_LIST; mode = MODE_LIST;
valid_flags = MODE_NONINTERACTIVE|MODE_LONG_LIST; valid_flags = LIST_VALID_FLAGS;
break; break;
case 'n': case 'n':
SET(flags, MODE_NONINTERACTIVE); SET(flags, MODE_NONINTERACTIVE);
@@ -439,6 +444,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
break; break;
case 'P': case 'P':
sudo_settings[ARG_PRESERVE_GROUPS].value = "true"; sudo_settings[ARG_PRESERVE_GROUPS].value = "true";
SET(flags, MODE_PRESERVE_GROUPS);
break; break;
case 'p': case 'p':
/* An empty prompt is allowed. */ /* An empty prompt is allowed. */
@@ -505,7 +511,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
if (mode && mode != MODE_VALIDATE) if (mode && mode != MODE_VALIDATE)
usage_excl(); usage_excl();
mode = MODE_VALIDATE; mode = MODE_VALIDATE;
valid_flags = MODE_NONINTERACTIVE; valid_flags = VALIDATE_VALID_FLAGS;
break; break;
case 'V': case 'V':
if (mode && mode != MODE_VERSION) if (mode && mode != MODE_VERSION)
@@ -533,7 +539,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
if (!mode) { if (!mode) {
/* Defer -k mode setting until we know whether it is a flag or not */ /* Defer -k mode setting until we know whether it is a flag or not */
if (sudo_settings[ARG_IGNORE_TICKET].value != NULL) { if (sudo_settings[ARG_IGNORE_TICKET].value != NULL) {
if (argc == 0 && !(flags & (MODE_SHELL|MODE_LOGIN_SHELL))) { if (argc == 0 && !ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL)) {
mode = MODE_INVALIDATE; /* -k by itself */ mode = MODE_INVALIDATE; /* -k by itself */
sudo_settings[ARG_IGNORE_TICKET].value = NULL; sudo_settings[ARG_IGNORE_TICKET].value = NULL;
valid_flags = 0; valid_flags = 0;
@@ -601,7 +607,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
/* /*
* For shell mode we need to rewrite argv * For shell mode we need to rewrite argv
*/ */
if (ISSET(mode, MODE_RUN) && ISSET(flags, MODE_SHELL)) { if (ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL) && ISSET(mode, MODE_RUN)) {
char **av, *cmnd = NULL; char **av, *cmnd = NULL;
int ac = 1; int ac = 1;