alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make it clear that being able to restore root is a failure

Browse source
This commit is contained in:
emersion 2018-10-29 23:52:03 +01:00
parent cd0bae80b6
commit 9dae68eba5
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/main.c
View file

@ -197,17 +197,18 @@ static void log_kernel(void) {
static void drop_permissions(void) { static void drop_permissions(void) {
if (getuid() != geteuid() || getgid() != getegid()) { if (getuid() != geteuid() || getgid() != getegid()) {
if (setgid(getgid()) != 0) { if (setgid(getgid()) != 0) {
wlr_log(WLR_ERROR, "Unable to drop root"); wlr_log(WLR_ERROR, "Unable to drop root, refusing to start");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (setuid(getuid()) != 0) { if (setuid(getuid()) != 0) {
wlr_log(WLR_ERROR, "Unable to drop root"); wlr_log(WLR_ERROR, "Unable to drop root, refusing to start");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
if (setuid(0) != -1) { if (setuid(0) != -1) {
wlr_log(WLR_ERROR, "Root privileges can be restored."); wlr_log(WLR_ERROR, "Unable to drop root (we shouldn't be able to "
exit(EXIT_FAILURE); "restore it after setuid), refusing to start");
return false;
} }
} }