libpam: use close_range() to close file descriptors

* configure.ac: check whether close_range() is available in the system.
* libpam/pam_modutil_sanitize.c: use close_range() to close all file
  descriptors. If the interface isn't available use the previous
  approach.

Link: https://github.com/linux-pam/linux-pam/pull/276
Resolves: https://issues.redhat.com/browse/RHEL-5099

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa 2023-10-25 09:46:15 +02:00
parent da484d7243
commit d6103b3005
2 changed files with 18 additions and 2 deletions

View File

@ -638,6 +638,7 @@ AC_CHECK_FUNCS(quotactl)
AC_CHECK_FUNCS(unshare)
AC_CHECK_FUNCS(explicit_bzero memset_explicit)
AC_CHECK_FUNCS([ruserok_af ruserok], [break])
AC_CHECK_FUNCS(close_range)
AC_ARG_ENABLE([regenerate-docu],
AS_HELP_STRING([--disable-regenerate-docu],[Don't re-build documentation from XML sources]),

View File

@ -11,6 +11,10 @@
#include <syslog.h>
#include <sys/resource.h>
#ifndef CLOSE_RANGE_UNSHARE
#define CLOSE_RANGE_UNSHARE (1U << 1)
#endif /* CLOSE_RANGE_UNSHARE */
/*
* Creates a pipe, closes its write end, redirects fd to its read end.
* Returns fd on success, -1 otherwise.
@ -84,9 +88,8 @@ redirect_out(pam_handle_t *pamh, enum pam_modutil_redirect_fd mode,
return fd;
}
/* Closes all descriptors after stderr. */
static void
close_fds(void)
close_fds_iteratively(void)
{
/*
* An arbitrary upper limit for the maximum file descriptor number
@ -111,6 +114,18 @@ close_fds(void)
close(fd);
}
/* Closes all descriptors after stderr. */
static void
close_fds(void)
{
#ifdef HAVE_CLOSE_RANGE
if (close_range(STDERR_FILENO+1, -1U, CLOSE_RANGE_UNSHARE) == 0)
return;
#endif /* HAVE_CLOSE_RANGE */
close_fds_iteratively();
}
int
pam_modutil_sanitize_helper_fds(pam_handle_t *pamh,
enum pam_modutil_redirect_fd stdin_mode,