From: Karel Zak <kzak@redhat.com>
Date: Thu, 15 Jul 2021 10:51:39 +0000 (+0200)
Subject: login: add callback for close_range()
X-Git-Tag: v2.38-rc1~364
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cae071ed7264fbbfb03a250a28c78d12e641c51f;p=thirdparty%2Futil-linux.git

login: add callback for close_range()

Let's make it more robust for old kernels where is no close_range() or
in cases when it's unsuccessful.

Reported-by: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/fileutils.h b/include/fileutils.h
index f86426b964..17ad429385 100644
--- a/include/fileutils.h
+++ b/include/fileutils.h
@@ -91,9 +91,7 @@ static inline int close_range(unsigned int first, unsigned int last, int flags)
 # endif	/* SYS_close_range */
 #endif	/* __linux__ */
 
-#ifndef HAVE_CLOSE_RANGE
 extern void ul_close_all_fds(unsigned int first, unsigned int last);
-#endif
 
 #define UL_COPY_READ_ERROR (-1)
 #define UL_COPY_WRITE_ERROR (-2)
diff --git a/lib/fileutils.c b/lib/fileutils.c
index a979b03acb..7a8fce26f0 100644
--- a/lib/fileutils.c
+++ b/lib/fileutils.c
@@ -129,7 +129,6 @@ unsigned int get_fd_tabsize(void)
 	return m;
 }
 
-#ifndef HAVE_CLOSE_RANGE
 void ul_close_all_fds(unsigned int first, unsigned int last)
 {
 	struct dirent *d;
@@ -166,7 +165,6 @@ void ul_close_all_fds(unsigned int first, unsigned int last)
 		}
 	}
 }
-#endif
 
 #ifdef TEST_PROGRAM_FILEUTILS
 int main(int argc, char *argv[])
@@ -189,10 +187,10 @@ int main(int argc, char *argv[])
 		ignore_result( dup(STDIN_FILENO) );
 
 # ifdef HAVE_CLOSE_RANGE
-		close_range(STDERR_FILENO + 1, ~0U, 0);
-# else
-		ul_close_all_fds(STDERR_FILENO + 1, ~0U);
+		if (close_range(STDERR_FILENO + 1, ~0U, 0) < 0)
 # endif
+			ul_close_all_fds(STDERR_FILENO + 1, ~0U);
+
 	} else if (strcmp(argv[1], "--copy-file") == 0) {
 		int ret = ul_copy_file(STDIN_FILENO, STDOUT_FILENO);
 		if (ret == UL_COPY_READ_ERROR)
diff --git a/login-utils/login.c b/login-utils/login.c
index d926466d3e..c6cd340b69 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -1357,10 +1357,9 @@ static void initialize(int argc, char **argv, struct login_context *cxt)
 #endif
 	}
 #ifdef HAVE_CLOSE_RANGE
-	close_range(STDERR_FILENO + 1, ~0U, 0);
-#else
-	ul_close_all_fds(STDERR_FILENO + 1, ~0U);
+	if (close_range(STDERR_FILENO + 1, ~0U, 0) < 0)
 #endif
+		ul_close_all_fds(STDERR_FILENO + 1, ~0U);
 }
 
 int main(int argc, char **argv)