mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 16:37:19 +09:00
Handle or voidify all calls to close_all_fds()
In activate, it is important that we close the fds. In other cases, meh.
This commit is contained in:
@@ -74,7 +74,9 @@ static int open_sockets(int *epoll_fd, bool accept) {
|
||||
except[fd] = fd;
|
||||
|
||||
log_close();
|
||||
close_all_fds(except, 3 + n);
|
||||
r = close_all_fds(except, 3 + n);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to close all file descriptors: %m");
|
||||
}
|
||||
|
||||
/** Note: we leak some fd's on error here. I doesn't matter
|
||||
|
||||
@@ -1001,7 +1001,7 @@ _noreturn_ void freeze(void) {
|
||||
log_close();
|
||||
|
||||
/* Make sure nobody waits for us on a socket anymore */
|
||||
close_all_fds(NULL, 0);
|
||||
(void) close_all_fds(NULL, 0);
|
||||
|
||||
sync();
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
|
||||
if (rearrange_stdio(-1, pipe_fds[1], -1) < 0)
|
||||
_exit(EXIT_FAILURE);
|
||||
|
||||
close_all_fds(NULL, 0);
|
||||
(void) close_all_fds(NULL, 0);
|
||||
|
||||
(void) rlimit_nofile_safe();
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ int stub_pid1(sd_id128_t uuid) {
|
||||
reset_all_signal_handlers();
|
||||
|
||||
log_close();
|
||||
close_all_fds(NULL, 0);
|
||||
(void) close_all_fds(NULL, 0);
|
||||
log_open();
|
||||
|
||||
/* Flush out /proc/self/environ, so that we don't leak the environment from the host into the container. Also,
|
||||
|
||||
Reference in New Issue
Block a user