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

Fix set/restore perms for systems w/o setresuid

Browse Source
This commit is contained in:
Todd C. Miller
2010-04-11 16:38:42 -04:00
parent 744eae82e7
commit 0d2524e68e
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/sudoers/set_perms.c
View File

@@ -240,8 +240,7 @@ bad:
* This version of set_perms() works fine with the "stay_setuid" option. * This version of set_perms() works fine with the "stay_setuid" option.
*/ */
int int
set_perms(perm) set_perms2(int perm, int push_it)
int perm;
{ {
const char *errstr; const char *errstr;
int noexit; int noexit;
@@ -249,8 +248,12 @@ set_perms(perm)
noexit = ISSET(perm, PERM_NOEXIT); noexit = ISSET(perm, PERM_NOEXIT);
CLR(perm, PERM_MASK); CLR(perm, PERM_MASK);
if (perm_stack_depth == PERM_STACK_MAX) {
errno = EINVAL;
goto bad;
}
if (perm == perm_current) if (perm == perm_current)
return(1); goto done;
switch (perm) { switch (perm) {
case PERM_ROOT: case PERM_ROOT:
@@ -339,6 +342,9 @@ set_perms(perm)
break; break;
} }
done:
if (push_it)
perm_stack[perm_stack_depth++] = perm_current;
perm_current = perm; perm_current = perm;
return(1); return(1);
bad: bad:
@@ -357,8 +363,7 @@ bad:
* NOTE: does not support the "stay_setuid" option. * NOTE: does not support the "stay_setuid" option.
*/ */
int int
set_perms(perm) set_perms2(int perm, int push_it)
int perm;
{ {
const char *errstr; const char *errstr;
int noexit; int noexit;
@@ -366,8 +371,12 @@ set_perms(perm)
noexit = ISSET(perm, PERM_NOEXIT); noexit = ISSET(perm, PERM_NOEXIT);
CLR(perm, PERM_MASK); CLR(perm, PERM_MASK);
if (perm_stack_depth == PERM_STACK_MAX) {
errno = EINVAL;
goto bad;
}
if (perm == perm_current) if (perm == perm_current)
return(1); goto done;
/* /*
* Since we only have setuid() and seteuid() and semantics * Since we only have setuid() and seteuid() and semantics
@@ -460,6 +469,9 @@ set_perms(perm)
break; break;
} }
done:
if (push_it)
perm_stack[perm_stack_depth++] = perm_current;
perm_current = perm; perm_current = perm;
return(1); return(1);
bad: bad:
@@ -478,8 +490,7 @@ bad:
* Also, SUDOERS_UID and SUDOERS_GID are not used. * Also, SUDOERS_UID and SUDOERS_GID are not used.
*/ */
int int
set_perms(perm) set_perms2(int perm, int push_it)
int perm;
{ {
const char *errstr; const char *errstr;
int noexit; int noexit;
@@ -487,8 +498,12 @@ set_perms(perm)
noexit = ISSET(perm, PERM_NOEXIT); noexit = ISSET(perm, PERM_NOEXIT);
CLR(perm, PERM_MASK); CLR(perm, PERM_MASK);
if (perm_stack_depth == PERM_STACK_MAX) {
errno = EINVAL;
goto bad;
}
if (perm == perm_current) if (perm == perm_current)
return(1); goto done;
switch (perm) { switch (perm) {
case PERM_ROOT: case PERM_ROOT:
@@ -526,6 +541,9 @@ set_perms(perm)
break; break;
} }
done:
if (push_it)
perm_stack[perm_stack_depth++] = perm_current;
perm_current = perm; perm_current = perm;
return(1); return(1);
bad: bad: