Handle or voidify all calls to close_all_fds()

keszybz · keszybz · commit 7acf581a58ba · 2019-03-15T15:46:41.000+01:00
In activate, it is important that we close the fds. In other cases, meh.
diff --git a/src/activate/activate.c b/src/activate/activate.c
@@ -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
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
@@ -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();
 
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
@@ -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();
 
diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ static int open_sockets(int *epoll_fd, bool accept) {`
`74`	`74`	`except[fd] = fd;`
`75`	`75`
`76`	`76`	`log_close();`
`77`		`- close_all_fds(except, 3 + n);`
	`77`	`+ r = close_all_fds(except, 3 + n);`
	`78`	`+ if (r < 0)`
	`79`	`+ return log_error_errno(r, "Failed to close all file descriptors: %m");`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`/** Note: we leak some fd's on error here. I doesn't matter`