Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2e79c15
Add OpenSSH's closefrom() replacement implementation.
Landon Fuller committed 11 years ago
commit 2e79c153c86b68335936032b7cc18343c3910e14
parent 5ec96d9
2 files changed +131 -1
added compat/closefrom.c
@@ -0,0 +1,109 @@
+ 
/*
+ 
 * Copyright (c) 2004-2005 Todd C. Miller <Todd.Miller@courtesan.com>
+ 
 *
+ 
 * Permission to use, copy, modify, and distribute this software for any
+ 
 * purpose with or without fee is hereby granted, provided that the above
+ 
 * copyright notice and this permission notice appear in all copies.
+ 
 *
+ 
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ 
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ 
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ 
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ 
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ 
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ 
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
 */
+
+ 
#include "bsd_compat.h"
+
+ 
#ifndef HAVE_CLOSEFROM
+
+ 
#include <sys/types.h>
+ 
#include <sys/param.h>
+ 
#include <unistd.h>
+ 
#include <stdio.h>
+ 
#ifdef HAVE_FCNTL_H
+ 
# include <fcntl.h>
+ 
#endif
+ 
#include <limits.h>
+ 
#include <stdlib.h>
+ 
#include <stddef.h>
+ 
#include <string.h>
+ 
#include <unistd.h>
+ 
#ifdef HAVE_DIRENT_H
+ 
# include <dirent.h>
+ 
# define NAMLEN(dirent) strlen((dirent)->d_name)
+ 
#else
+ 
# define dirent direct
+ 
# define NAMLEN(dirent) (dirent)->d_namlen
+ 
# ifdef HAVE_SYS_NDIR_H
+ 
#  include <sys/ndir.h>
+ 
# endif
+ 
# ifdef HAVE_SYS_DIR_H
+ 
#  include <sys/dir.h>
+ 
# endif
+ 
# ifdef HAVE_NDIR_H
+ 
#  include <ndir.h>
+ 
# endif
+ 
#endif
+
+ 
#ifndef OPEN_MAX
+ 
# define OPEN_MAX	256
+ 
#endif
+
+ 
#if 0
+ 
__unused static const char rcsid[] = "$Sudo: closefrom.c,v 1.11 2006/08/17 15:26:54 millert Exp $";
+ 
#endif /* lint */
+
+ 
/*
+ 
 * Close all file descriptors greater than or equal to lowfd.
+ 
 */
+ 
#ifdef HAVE_FCNTL_CLOSEM
+ 
void
+ 
closefrom(int lowfd)
+ 
{
+ 
    (void) fcntl(lowfd, F_CLOSEM, 0);
+ 
}
+ 
#else
+ 
void
+ 
closefrom(int lowfd)
+ 
{
+ 
    long fd, maxfd;
+ 
#if defined(HAVE_DIRFD) && defined(HAVE_PROC_PID)
+ 
    char fdpath[PATH_MAX], *endp;
+ 
    struct dirent *dent;
+ 
    DIR *dirp;
+ 
    int len;
+
+ 
    /* Check for a /proc/$$/fd directory. */
+ 
    len = snprintf(fdpath, sizeof(fdpath), "/proc/%ld/fd", (long)getpid());
+ 
    if (len > 0 && (size_t)len <= sizeof(fdpath) && (dirp = opendir(fdpath))) {
+ 
	while ((dent = readdir(dirp)) != NULL) {
+ 
	    fd = strtol(dent->d_name, &endp, 10);
+ 
	    if (dent->d_name != endp && *endp == '\0' &&
+ 
		fd >= 0 && fd < INT_MAX && fd >= lowfd && fd != dirfd(dirp))
+ 
		(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);
+ 
    }
+ 
}
+ 
#endif /* !HAVE_FCNTL_CLOSEM */
+ 
#endif /* HAVE_CLOSEFROM */
modified configure.ac
@@ -106,6 +106,7 @@ AC_CHECK_HEADERS_ONCE([stdio.h])
AC_CHECK_HEADERS_ONCE([float.h])

AC_CHECK_HEADERS_ONCE([math.h])

AC_CHECK_HEADERS_ONCE([osreldate.h])
+ 
AC_CHECK_HEADERS_ONCE([dirent.h], [sys/ndir.h], [sys/dir.h], [ndir.h])



AC_CHECK_HEADER([regex.h], [

	AC_DEFINE(HAVE_REGEX_H, 1, [Define to 1 if you have the <regex.h> header file.])
@@ -119,8 +120,14 @@ AC_CHECK_FUNCS_ONCE([localtime_r])
AC_CHECK_FUNCS_ONCE([gmtime_r])

AC_CHECK_FUNCS_ONCE([strerror_r])

AC_CHECK_FUNCS_ONCE([strtonum])
- 
AC_CHECK_FUNCS_ONCE([fstatat], [openat], [unlinkat])
+ 
AC_CHECK_FUNCS_ONCE([fstatat], [openat], [unlinkat], [readlinkat], [faccessat])
+ 
AC_CHECK_FUNCS_ONCE([be16dec], [be32dec], [be64dec], [le16dec], [le32dec], [le64dec],
+ 
		    [be16enc], [be32enc], [be64enc], [le16enc], [le32enc], [le64enc])

AC_CHECK_FUNCS_ONCE([flopen])
+ 
AC_CHECK_FUNCS_ONCE([eaccess])
+ 
AC_CHECK_FUNCS_ONCE([closefrom])
+ 
AC_CHECK_FUNCS_ONCE([dirfd])
+ 
AC_CHECK_FUNCS_ONCE([sysconf])



PKG_PROG_PKG_CONFIG
@@ -262,6 +269,20 @@ if test "$ac_cv_func_basename" = yes ; then
	AC_DEFINE(HAVE_BSD_BASENAME, 1, [Define 1 if you have 'basename(const char *)' function.])

fi
+ 
AC_MSG_CHECKING([for /proc/pid/fd directory])
+ 
if test -d "/proc/$$/fd" ; then
+ 
        AC_DEFINE([HAVE_PROC_PID], [1], [Define if you have /proc/$pid/fd])
+ 
        AC_MSG_RESULT([yes])
+ 
else
+ 
        AC_MSG_RESULT([no])
+ 
fi
+
+ 
AC_CHECK_DECL([F_CLOSEM],
+ 
        AC_DEFINE([HAVE_FCNTL_CLOSEM], [1], [Use F_CLOSEM fcntl for closefrom]),
+ 
        [],
+ 
        [ #include <limits.h>
+ 
          #include <fcntl.h> ]
+ 
)



AC_MSG_CHECKING([whether we should only build the static version of pkg])

AC_ARG_WITH([staticonly],