Attachment 3306 Details for Bug 3049 – refactor, add fallback

[patch] refactor, add fallback

bv3049.diff (text/plain), 4.21 KB, created by Damien Miller on 2019-08-02 11:01:38 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2019-08-02 11:01:38 AEST

Size: 4.21 KB

patch

obsolete

>commit fd5c09bd1db1cfd3a60e324d094659e2364e66ef
>Author: Damien Miller <djm@mindrot.org>
>Date:   Fri Aug 2 10:56:36 2019 +1000
>
>    add proc_fdinfo strategy for closefrom()
>    
>    based on patch from likan_999.student@sina.com in bz#3049
>    
>    refactor out fallback brute-force closefrom() implementation and
>    share it between /proc/pid/fd and proc_fdinfo strategies.
>
>diff --git a/configure.ac b/configure.ac
>index 1c35b090..34581c3f 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -679,6 +679,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
> 	AC_CHECK_LIB([sandbox], [sandbox_apply], [
> 	    SSHDLIBS="$SSHDLIBS -lsandbox"
> 	])
>+	AC_CHECK_HEADERS([libproc.h], [
>+	    AC_CHECK_DECLS([proc_pidinfo], [], [], [#include <libproc.h>])
>+	])
> 	;;
> *-*-dragonfly*)
> 	SSHDLIBS="$SSHDLIBS -lcrypt"
>diff --git a/openbsd-compat/bsd-closefrom.c b/openbsd-compat/bsd-closefrom.c
>index b56476a2..9f5e5861 100644
>--- a/openbsd-compat/bsd-closefrom.c
>+++ b/openbsd-compat/bsd-closefrom.c
>@@ -46,6 +46,11 @@
> #  include <ndir.h>
> # endif
> #endif
>+#if !defined(HAVE_FCNTL_CLOSEM) && \
>+    defined(HAVE_LIBPROC_H) && \
>+    HAVE_DECL_PROC_PIDINFO
>+#include <libproc.h>
>+#endif
> 
> #ifndef OPEN_MAX
> # define OPEN_MAX	256
>@@ -55,21 +60,85 @@
> __unused static const char rcsid[] = "$Sudo: closefrom.c,v 1.11 2006/08/17 15:26:54 millert Exp $";
> #endif /* lint */
> 
>+#ifndef HAVE_FCNTL_CLOSEM
> /*
>  * Close all file descriptors greater than or equal to lowfd.
>  */
>+static void
>+closefrom_fallback(int lowfd)
>+{
>+	long fd, maxfd;
>+
>+	/*
>+	 * Fall back on sysconf() or getdtablesize().  We avoid checking
>+	 * resource limits since it is possible to open a file descriptor
>+	 * and then drop the rlimit such that it is below the open fd.
>+	 */
>+#ifdef HAVE_SYSCONF
>+	maxfd = sysconf(_SC_OPEN_MAX);
>+#else
>+	maxfd = getdtablesize();
>+#endif /* HAVE_SYSCONF */
>+	if (maxfd < 0)
>+		maxfd = OPEN_MAX;
>+
>+	for (fd = lowfd; fd < maxfd; fd++)
>+		(void) close((int) fd);
>+}
>+#endif /* HAVE_FCNTL_CLOSEM */
>+
> #ifdef HAVE_FCNTL_CLOSEM
> void
> closefrom(int lowfd)
> {
>     (void) fcntl(lowfd, F_CLOSEM, 0);
> }
>-#else
>+#elif defined(HAVE_LIBPROC_H) && HAVE_DECL_PROC_PIDINFO
> void
> closefrom(int lowfd)
> {
>-    long fd, maxfd;
>-#if defined(HAVE_DIRFD) && defined(HAVE_PROC_PID)
>+	int bufsize, try, i, n, fd;
>+	pid_t pid = getpid();
>+	struct proc_fdinfo *fdinfo_buf = NULL;
>+
>+	/*
>+	 * Obtain map of open fds.
>+	 *
>+	 * Be prepared to retry a few times in case the table size changes
>+	 * between the size query and the actual attempt to fetch it.
>+	 */
>+	for (try = 0; try < 3; try++) {
>+		/* Obtain size */
>+		bufsize = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, NULL, 0);
>+		if (bufsize == 0)
>+			return; /* no fds, really? */
>+		else if (bufsize == -1)
>+			break;
>+		if ((fdinfo_buf = malloc(bufsize)) == NULL)
>+			break;
>+		if ((bufsize = proc_pidinfo(pid, PROC_PIDLISTFDS, 0,
>+		    fdinfo_buf, bufsize)) == NULL) {
>+			/* table size changed? retry... */
>+			free(fdinfo_buf);
>+			fdinfo_buf = NULL;
>+		}
>+		break;
>+	}
>+	/* If unable to obtain the fd map, then fall back to brute force */
>+	if (fdinfo_buf == NULL)
>+		closefrom_fallback(lowfd);
>+	/* Close fds from map */
>+	for (i = 0, n = bufsize / PROC_PIDLISTFD_SIZE; i < n; ++i) {
>+		fd = fdinfo_buf[i].proc_fd;
>+			if (fd >= lowfd) close(fd);
>+	}
>+	free(fdinfo_buf);
>+}
>+#elif defined(HAVE_DIRFD) && defined(HAVE_PROC_PID)
>+void
>+closefrom(int lowfd)
>+{
>+    long fd;
>     char fdpath[PATH_MAX], *endp;
>     struct dirent *dent;
>     DIR *dirp;
>@@ -85,25 +154,16 @@ closefrom(int lowfd)
> 		(void) close((int) fd);
> 	}
> 	(void) closedir(dirp);
>-    } else
>-#endif
>-    {
>-	/*
>-	 * Fall back on sysconf() or getdtablesize().  We avoid checking
>-	 * resource limits since it is possible to open a file descriptor
>-	 * and then drop the rlimit such that it is below the open fd.
>-	 */
>-#ifdef HAVE_SYSCONF
>-	maxfd = sysconf(_SC_OPEN_MAX);
>-#else
>-	maxfd = getdtablesize();
>-#endif /* HAVE_SYSCONF */
>-	if (maxfd < 0)
>-	    maxfd = OPEN_MAX;
>-
>-	for (fd = lowfd; fd < maxfd; fd++)
>-	    (void) close((int) fd);
>+	return;
>     }
>+    /* /proc/$$/fd strategy failed, fall back to brute force closure */
>+    closefrom_fallback(lowfd);
>+}
>+#else
>+void
>+closefrom(int lowfd)
>+{
>+	closefrom_fallback(lowfd);
> }
> #endif /* !HAVE_FCNTL_CLOSEM */
> #endif /* HAVE_CLOSEFROM */

Actions: View | Diff

Attachments on bug 3049: 3305 | 3306 | 3307 | 3309