diff options
| author | D.B <thejan.2009@gmail.com> | 2016-09-20 15:49:16 +0200 |
|---|---|---|
| committer | D.B <thejan.2009@gmail.com> | 2016-09-20 16:25:32 +0200 |
| commit | 5e585f96037854842827db478a978ff959026713 (patch) | |
| tree | 7e0bf08bce1b793e68035a4fa8ebd7f008ec0e1d | |
| parent | d98c26d0edbab66042ff3da0348d339fd857f99d (diff) | |
| download | sway-5e585f96037854842827db478a978ff959026713.tar.xz | |
Split setgid and setuid, add privilege check
This commit deals with issue #884. I consulted the following sources:
https://www.securecoding.cert.org/confluence/display/c/POS36-C.+Observe+correct+revocation+order+while+relinquishing+privileges
and
https://www.securecoding.cert.org/confluence/display/c/POS37-C.+Ensure+that+privilege+relinquishment+is+successful
| -rw-r--r-- | sway/main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sway/main.c b/sway/main.c index 972b260b..660da18c 100644 --- a/sway/main.c +++ b/sway/main.c @@ -156,10 +156,18 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } if (getuid() != geteuid() || getgid() != getegid()) { - if (setgid(getgid()) != 0 || setuid(getuid()) != 0) { + if (setgid(getgid()) != 0) { sway_log(L_ERROR, "Unable to drop root"); exit(EXIT_FAILURE); } + if (setuid(getuid()) != 0) { + sway_log(L_ERROR, "Unable to drop root"); + exit(EXIT_FAILURE); + } + } + if (setuid(0) != -1) { + sway_log(L_ERROR, "Root privileges can be restored."); + exit(EXIT_FAILURE); } char *socket_path = getenv("SWAYSOCK"); if (!socket_path) { |