diff options
author | Tobias Blass <tobiasblass@t-online.de> | 2018-06-13 00:39:24 +0200 |
---|---|---|
committer | Tobias Blass <tobiasblass@t-online.de> | 2018-06-19 00:19:57 +0200 |
commit | a5c091e3026eb41d3a4daef3db95b47a3445aa11 (patch) | |
tree | 3317961dd1425f428ccdebce378e0f010d57a14b /sway/server.c | |
parent | Merge pull request #2143 from vilhalmer/mark-pool-buffers-busy (diff) | |
download | sway-a5c091e3026eb41d3a4daef3db95b47a3445aa11.tar.gz sway-a5c091e3026eb41d3a4daef3db95b47a3445aa11.tar.zst sway-a5c091e3026eb41d3a4daef3db95b47a3445aa11.zip |
Perform (partial) server initialization before dropping privileges.
Some operations during backend creation (e.g. becoming DRM master)
require CAP_SYS_ADMIN privileges. At this point, sway has dropped them
already, though. This patch splits the privileged part of server_init
into its own function and calls it before dropping its privileges.
This fixes the bug with minimal security implications.
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sway/server.c b/sway/server.c index 824b1d8e..4745ab6e 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -25,9 +25,8 @@ | |||
25 | #include "sway/tree/layout.h" | 25 | #include "sway/tree/layout.h" |
26 | 26 | ||
27 | 27 | ||
28 | bool server_init(struct sway_server *server) { | 28 | bool server_privileged_prepare(struct sway_server *server) { |
29 | wlr_log(L_DEBUG, "Initializing Wayland server"); | 29 | wlr_log(L_DEBUG, "Preparing Wayland server initialization"); |
30 | |||
31 | server->wl_display = wl_display_create(); | 30 | server->wl_display = wl_display_create(); |
32 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 31 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
33 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); | 32 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); |
@@ -36,6 +35,12 @@ bool server_init(struct sway_server *server) { | |||
36 | wlr_log(L_ERROR, "Unable to create backend"); | 35 | wlr_log(L_ERROR, "Unable to create backend"); |
37 | return false; | 36 | return false; |
38 | } | 37 | } |
38 | return true; | ||
39 | } | ||
40 | |||
41 | bool server_init(struct sway_server *server) { | ||
42 | wlr_log(L_DEBUG, "Initializing Wayland server"); | ||
43 | |||
39 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); | 44 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); |
40 | assert(renderer); | 45 | assert(renderer); |
41 | 46 | ||