58719c9 compat: use close_range() on linux for closefrom() — HardenedBSD-pkg

HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

compat: use close_range() on linux for closefrom()

Baptiste Daroussin committed 3 months ago

commit 58719c92b337153f7eccfa4a823938f565ec3489
parent f03df38

5 files changed +9 -107

modified auto.def

@@ -178,7 +178,7 @@ cc-check-includes stdint.h inttypes.h

 # check for pkg itself
 cc-check-functions arc4random arc4random_stir chflagsat \
 	closefrom fopencookie funopen getprogname \
 	fopencookie funopen getprogname \
 	strtofflags strtonum utimensat __res_setservers \
 	fflagstostr reallocarray strchrnul \
 	copy_file_range

modified compat/Makefile.autosetup

@@ -1,7 +1,6 @@

 include @builddir@/mk/defs.mk
 LIB=	bsd_compat
 SRCS=	closefrom.c \
 	humanize_number.c \
 SRCS=	humanize_number.c \
 	strtonum.c \
 	funopen.c

modified compat/bsd_compat.h

@@ -92,10 +92,6 @@

 #include "humanize_number.h"
 #endif
 #if !HAVE_CLOSEFROM
 void closefrom(int lowfd);
 #endif
 #ifndef AT_FDCWD
 #define AT_FDCWD		-100
 #endif

deleted compat/closefrom.c

@@ -1,100 +0,0 @@

 /*
  * 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.
  */
 #if HAVE_DECL_F_CLOSEM
 void
 closefrom(int lowfd)
 {
     (void) fcntl(lowfd, F_CLOSEM, 0);
 }
 #else
 void
 closefrom(int lowfd)
 {
     long fd, maxfd;
 #if 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
     {
 	maxfd = sysconf(_SC_OPEN_MAX);
 	if (maxfd < 0)
 	    maxfd = OPEN_MAX;
 	for (fd = lowfd; fd < maxfd; fd++)
 	    (void) close((int) fd);
     }
 }
 #endif /* !HAVE_DECL_F_CLOSEM */
 #endif /* HAVE_CLOSEFROM */

modified libpkg/utils.c

@@ -568,7 +568,14 @@ process_spawn_pipe(FILE *inout[2], const char *command)

 			dup2(pipes[2], STDIN_FILENO);
 			close(pipes[2]);
 		}
 #ifndef __linux__
 		closefrom(STDERR_FILENO + 1);
 #else
 		long sc = sysconf(_SC_OPEN_MAX);
 		if (sc < 0)
 			sc = 1024;
 		close_range(STDERR_FILENO + 1, sc, 0);
 #endif
 		execve(_PATH_BSHELL, argv, environ);