mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-10-01 07:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3028 from emersion/disambiguate-drop-root-error

Browse source 
Make it clear that being able to restore root is a failure
This commit is contained in:
Drew DeVault 2018-11-01 19:01:18 +01:00 committed by GitHub
parent cd0bae80b6 f90ff1210b
commit b1aec1ef14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sway/main.c
View file

@ -29,7 +29,7 @@
static bool terminate_request = false; static bool terminate_request = false;
static int exit_value = 0; static int exit_value = 0;
struct sway_server server; struct sway_server server = {0};
void sway_terminate(int exit_code) { void sway_terminate(int exit_code) {
terminate_request = true; terminate_request = true;
@ -194,21 +194,23 @@ static void log_kernel(void) {
} }
static void drop_permissions(void) { static bool 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); return false;
} }
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); return false;
} }
} }
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;
} }
return true;
} }
void enable_debug_flag(const char *flag) { void enable_debug_flag(const char *flag) {
@ -321,7 +323,9 @@ int main(int argc, char **argv) {
wlr_log(WLR_ERROR, "Don't use options with the IPC client"); wlr_log(WLR_ERROR, "Don't use options with the IPC client");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
drop_permissions(); if (!drop_permissions()) {
exit(EXIT_FAILURE);
}
char *socket_path = getenv("SWAYSOCK"); char *socket_path = getenv("SWAYSOCK");
if (!socket_path) { if (!socket_path) {
wlr_log(WLR_ERROR, "Unable to retrieve socket path"); wlr_log(WLR_ERROR, "Unable to retrieve socket path");
@ -341,7 +345,10 @@ int main(int argc, char **argv) {
detect_proprietary(allow_unsupported_gpu); detect_proprietary(allow_unsupported_gpu);
detect_raspi(); detect_raspi();
drop_permissions(); if (!drop_permissions()) {
server_fini(&server);
exit(EXIT_FAILURE);
}
// handle SIGTERM signals // handle SIGTERM signals
signal(SIGTERM, sig_handler); signal(SIGTERM, sig_handler);