shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

dmeventd: use daemon_close_stray_fds

Browse Source 
Use common code for close stray descriptors.
This commit is contained in:
Zdenek Kabelac 2024-04-13 21:20:18 +02:00
parent 79cdfc8ca6
commit 716fc27fdd
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
daemons/dmeventd/dmeventd.c
View File

@ -23,6 +23,8 @@
#include "libdm/misc/dm-logging.h" #include "libdm/misc/dm-logging.h"
#include "base/memory/zalloc.h" #include "base/memory/zalloc.h"
#include "libdaemon/server/daemon-stray.h"
#include <dlfcn.h> #include <dlfcn.h>
#include <pthread.h> #include <pthread.h>
#include <sys/file.h> #include <sys/file.h>
@ -1944,11 +1946,15 @@ static void _remove_files_on_exit(void)
static void _daemonize(void) static void _daemonize(void)
{ {
int child_status; int child_status;
int fd;
pid_t pid; pid_t pid;
struct rlimit rlim;
struct timeval tval; struct timeval tval;
sigset_t my_sigset; sigset_t my_sigset;
struct custom_fds custom_fds = {
/* Do not close fds preloaded by systemd! */
.out = (_systemd_activation) ? SD_FD_FIFO_SERVER : -1,
.err = -1,
.report = (_systemd_activation) ? SD_FD_FIFO_CLIENT : -1,
};
sigemptyset(&my_sigset); sigemptyset(&my_sigset);
if (sigprocmask(SIG_SETMASK, &my_sigset, NULL) < 0) { if (sigprocmask(SIG_SETMASK, &my_sigset, NULL) < 0) {
@ -1992,20 +1998,7 @@ static void _daemonize(void)
if (chdir("/")) if (chdir("/"))
exit(EXIT_CHDIR_FAILURE); exit(EXIT_CHDIR_FAILURE);
if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) daemon_close_stray_fds("dmeventd", 0, -1, &custom_fds);
fd = 256; /* just have to guess */
else
fd = rlim.rlim_cur;
for (--fd; fd >= 0; fd--) {
#ifdef __linux__
/* Do not close fds preloaded by systemd! */
if (_systemd_activation &&
(fd == SD_FD_FIFO_SERVER || fd == SD_FD_FIFO_CLIENT))
continue;
#endif
(void) close(fd);
}
/* coverity[leaked_handle] dont't care */ /* coverity[leaked_handle] dont't care */
if ((open("/dev/null", O_RDONLY) < 0) || if ((open("/dev/null", O_RDONLY) < 0) ||