RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restorecond: Set GLib IO channels to nonblocking 

Without nonblocking IO, g_io_channel_read_chars waits indefinitely for more
data without ever returning control to the event loop.

Set the IO channels to nonblocking to fix SIGTERM handling.

Signed-off-by: Fabian Vogt <fvogt@suse.de>
Acked-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
Fabian Vogt 2024-10-24 10:48:16 +02:00 committed by James Carter
parent 5131c4794d
commit 271eb4fe44
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
restorecond/user.c
View File

@ -239,6 +239,7 @@ static int local_server(void) {
/* watch for stdin/terminal going away */ /* watch for stdin/terminal going away */
GIOChannel *in = g_io_channel_unix_new(0); GIOChannel *in = g_io_channel_unix_new(0);
g_io_channel_set_encoding(in, NULL, NULL); g_io_channel_set_encoding(in, NULL, NULL);
g_io_channel_set_flags(in, g_io_channel_get_flags(in) | G_IO_FLAG_NONBLOCK, NULL);
g_io_add_watch_full( in, g_io_add_watch_full( in,
G_PRIORITY_HIGH, G_PRIORITY_HIGH,
G_IO_IN|G_IO_ERR|G_IO_HUP, G_IO_IN|G_IO_ERR|G_IO_HUP,
@ -284,6 +285,7 @@ int server(int master_fd, const char *watch_file) {
GIOChannel *c = g_io_channel_unix_new(master_fd); GIOChannel *c = g_io_channel_unix_new(master_fd);
g_io_channel_set_encoding(c, NULL, NULL); g_io_channel_set_encoding(c, NULL, NULL);
g_io_channel_set_flags(c, g_io_channel_get_flags(c) | G_IO_FLAG_NONBLOCK, NULL);
g_io_add_watch_full(c, g_io_add_watch_full(c,
G_PRIORITY_HIGH, G_PRIORITY_HIGH,