shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-07 17:17:44 +03:00
Code

fd-util: always return 0 on success in close_all_fds()

Browse Source 
We never make use of the return value, and in case of close_range() we
don't even know how many fds got closed, hence don't pretend we knew.
This commit is contained in:
Lennart Poettering 2021-10-12 15:54:54 +02:00
parent f498720a34
commit c844f0a924
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/basic/fd-util.c
View File

@ -262,7 +262,7 @@ int close_all_fds(const int except[], size_t n_except) {
/* Close everything. Yay! */
if (close_range(3, -1, 0) >= 0)
return 1;
return 0;
if (!ERRNO_IS_NOT_SUPPORTED(errno) && !ERRNO_IS_PRIVILEGE(errno))
return -errno;
@ -297,8 +297,6 @@ int close_all_fds(const int except[], size_t n_except) {
sorted = newa(int, n_sorted);
if (sorted) {
int c = 0;
memcpy(sorted, except, n_except * sizeof(int));
/* Let's add fd 2 to the list of fds, to simplify the loop below, as this
@ -326,18 +324,16 @@ int close_all_fds(const int except[], size_t n_except) {
have_close_range = false;
break;
}
c += end - start - 1;
}
if (have_close_range) {
/* The loop succeeded. Let's now close everything beyond the end */
if (sorted[n_sorted-1] >= INT_MAX) /* Dont let the addition below overflow */
return c;
return 0;
if (close_range(sorted[n_sorted-1] + 1, -1, 0) >= 0)
return c + 1;
return 0;
if (!ERRNO_IS_NOT_SUPPORTED(errno) && !ERRNO_IS_PRIVILEGE(errno))
return -errno;