|
 |
fd2e1e |
From 8cf74e7f147836e81c3583a046e4dc2b4673a14c Mon Sep 17 00:00:00 2001
|
|
|
fd2e1e |
From: Radovan Sroka <rsroka@redhat.com>
|
|
|
fd2e1e |
Date: Thu, 11 Mar 2021 14:45:50 +0100
|
|
|
fd2e1e |
Subject: [PATCH] Ensure that fifo will be removed after termination
|
|
|
fd2e1e |
|
|
|
fd2e1e |
- unlink_fifo() will be called after every succesful termination
|
|
|
fd2e1e |
because dnf/yum can hang if the pipe exists after daemon termination
|
|
|
fd2e1e |
|
|
|
fd2e1e |
- move preconstruct_fifo() out of the scope because it is needed also
|
|
|
fd2e1e |
when the daemon is configured to run as root
|
|
|
fd2e1e |
|
|
|
fd2e1e |
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
|
|
|
fd2e1e |
---
|
|
|
fd2e1e |
src/daemon/fapolicyd.c | 13 +++++++++++--
|
|
|
fd2e1e |
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
fd2e1e |
|
|
|
fd2e1e |
diff --git a/src/daemon/fapolicyd.c b/src/daemon/fapolicyd.c
|
|
|
fd2e1e |
index 5dce666..c29611c 100644
|
|
|
fd2e1e |
--- a/src/daemon/fapolicyd.c
|
|
|
fd2e1e |
+++ b/src/daemon/fapolicyd.c
|
|
|
fd2e1e |
@@ -446,6 +446,17 @@ int main(int argc, const char *argv[])
|
|
|
fd2e1e |
openlog("fapolicyd", LOG_PID, LOG_DAEMON);
|
|
|
fd2e1e |
}
|
|
|
fd2e1e |
|
|
|
fd2e1e |
+ // Set the exit function so there is always a fifo cleanup
|
|
|
fd2e1e |
+ if (atexit(unlink_fifo)) {
|
|
|
fd2e1e |
+ msg(LOG_ERR, "Cannot set exit function");
|
|
|
fd2e1e |
+ exit(1);
|
|
|
fd2e1e |
+ }
|
|
|
fd2e1e |
+
|
|
|
fd2e1e |
+ if (preconstruct_fifo(&config)) {
|
|
|
fd2e1e |
+ msg(LOG_ERR, "Cannot contruct a pipe");
|
|
|
fd2e1e |
+ exit(1);
|
|
|
fd2e1e |
+ }
|
|
|
fd2e1e |
+
|
|
|
fd2e1e |
// Setup filesystem to watch list
|
|
|
fd2e1e |
init_fs_list(config.watch_fs);
|
|
|
fd2e1e |
|
|
|
fd2e1e |
@@ -454,8 +465,6 @@ int main(int argc, const char *argv[])
|
|
|
fd2e1e |
|
|
|
fd2e1e |
// If we are not going to be root, then setup necessary capabilities
|
|
|
fd2e1e |
if (config.uid != 0) {
|
|
|
fd2e1e |
- if (preconstruct_fifo(&config))
|
|
|
fd2e1e |
- exit(1);
|
|
|
fd2e1e |
capng_clear(CAPNG_SELECT_BOTH);
|
|
|
fd2e1e |
capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
|
|
|
fd2e1e |
CAP_DAC_OVERRIDE, CAP_SYS_ADMIN, CAP_SYS_PTRACE,
|
|
|
fd2e1e |
--
|
|
|
fd2e1e |
2.26.2
|
|
|
fd2e1e |
|