mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-29 14:42:11 +01:00
Code Releases Activity

43008: Improve code to remove privileges.

Browse source 
Remove warnings of unused values as we always check the finally
result later.

Put segid before setuid as the setgid could fail if UID
no longer privileged.
This commit is contained in:
Peter Stephenson 2018-06-15 10:27:29 +01:00
parent d1eb0f4ed1
commit f37c181b29
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2018-06-15 Peter Stephenson <p.stephenson@samsung.com>
* 43008: Src/otpions.c: combine suggestion from Sebastain to
silence warnings for double setgid/setuid with suggestion
from Eitan to put setgid first.
2018-06-13 dana <dana@dana.is>
* 42992: Completion/Unix/Command/_bash: Fix minor escaping bug

31
Src/options.c
View file

@ -769,15 +769,32 @@ dosetopt(int optno, int value, int force, char *new_opts)
} else if(optno == PRIVILEGED && !value) {
/* unsetting PRIVILEGED causes the shell to make itself unprivileged */
#ifdef HAVE_SETUID
setuid(getuid());
setgid(getgid());
if (setuid(getuid())) {
zwarn("failed to change user ID: %e", errno);
return -1;
} else if (setgid(getgid())) {
int ignore_err;
errno = 0;
/*
* Set the GID first as if we set the UID to non-privileged it
* might be impossible to restore the GID.
*
* Some OSes (possibly no longer around) have been known to
* fail silently the first time, so we attempt the change twice.
* If it fails we are guaranteed to pick this up the second
* time, so ignore the first time.
*
* Some versions of gcc make it hard to ignore the results the
* first time, hence the following. (These are probably not
* systems that require the doubled calls.)
*/
ignore_err = setgid(getgid());
(void)ignore_err;
ignore_err = setuid(getuid());
(void)ignore_err;
if (setgid(getgid())) {
zwarn("failed to change group ID: %e", errno);
return -1;
}
} else if (setuid(getuid())) {
zwarn("failed to change user ID: %e", errno);
return -1;
}
#else
zwarn("setuid not available");
return -1;