From owner-p4-projects@FreeBSD.ORG Tue Jun 16 21:45:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01603106568C; Tue, 16 Jun 2009 21:45:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 988C6106568F for ; Tue, 16 Jun 2009 21:45:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 850558FC08 for ; Tue, 16 Jun 2009 21:45:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GLjc61034519 for ; Tue, 16 Jun 2009 21:45:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5GLjc57034517 for perforce@freebsd.org; Tue, 16 Jun 2009 21:45:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Jun 2009 21:45:38 GMT Message-Id: <200906162145.n5GLjc57034517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 164537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 21:45:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=164537 Change 164537 by rwatson@rwatson_freebsd_capabilities on 2009/06/16 21:45:19 Rather than a compile-time decision about the use of sandbox vs. non-sandbox API use in libcapability for starting sandboxes, use ld_insandbox() to check whether we're in a sandbox. Now we're back to needing only a single libcapability compile, rather than two versions. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#19 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#16 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#19 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#18 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#19 $ */ #ifndef _LIBCAPABILITY_H_ @@ -133,5 +133,6 @@ * applications. */ int ld_caplibindex_lookup(const char *libname, int *fdp); +int ld_insandbox(void); #endif /* !_LIBCAPABILITY_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#16 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#15 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#16 $ */ #include @@ -245,46 +245,43 @@ return (-1); bzero(lcsp, sizeof(*lcsp)); -#ifdef IN_CAP_MODE - if (ld_caplibindex_lookup(LD_ELF_CAP_SO, &fd_ldso) < 0) - goto out_error; - if (ld_caplibindex_lookup(LIBC_SO, &fd_libc) < 0) - goto out_error; - if (ld_caplibindex_lookup(LIBZ_SO, &fd_libz) < 0) - goto out_error; - if (ld_caplibindex_lookup(LIBBZ2_SO, &fd_libbz2) < 0) - goto out_error; - if (ld_caplibindex_lookup(LIBCAPABILITY_SO, &fd_libcapability) < 0) - goto out_error; - if (ld_caplibindex_lookup(_PATH_DEVNULL, &fd_devnull) < 0) - goto out_error; -#else - fd_ldso = open(PATH_LD_ELF_CAP_SO "/" LD_ELF_CAP_SO, O_RDONLY); - if (fd_ldso < 0) - goto out_error; + if (ld_insandbox()) { + if (ld_caplibindex_lookup(LD_ELF_CAP_SO, &fd_ldso) < 0) + goto out_error; + if (ld_caplibindex_lookup(LIBC_SO, &fd_libc) < 0) + goto out_error; + if (ld_caplibindex_lookup(LIBZ_SO, &fd_libz) < 0) + goto out_error; + if (ld_caplibindex_lookup(LIBBZ2_SO, &fd_libbz2) < 0) + goto out_error; + if (ld_caplibindex_lookup(LIBCAPABILITY_SO, + &fd_libcapability) < 0) + goto out_error; + if (ld_caplibindex_lookup(_PATH_DEVNULL, &fd_devnull) < 0) + goto out_error; + } else { + fd_ldso = open(PATH_LD_ELF_CAP_SO "/" LD_ELF_CAP_SO, + O_RDONLY); + if (fd_ldso < 0) + goto out_error; + fd_libc = open(_PATH_LIB "/" LIBC_SO, O_RDONLY); + if (fd_libc < 0) + goto out_error; + fd_libz = open(_PATH_LIB "/" LIBZ_SO, O_RDONLY); + if (fd_libz < 0) + goto out_error; + fd_libbz2 = open(_PATH_USR_LIB "/" LIBBZ2_SO, O_RDONLY); + if (fd_libbz2 < 0) + goto out_error; + fd_libcapability = open(_PATH_USR_LIB "/" LIBCAPABILITY_SO, + O_RDONLY); + if (fd_libcapability < 0) + goto out_error; + fd_devnull = open(_PATH_DEVNULL, O_RDWR); + if (fd_devnull < 0) + goto out_error; + } - fd_libc = open(_PATH_LIB "/" LIBC_SO, O_RDONLY); - if (fd_libc < 0) - goto out_error; - - fd_libz = open(_PATH_LIB "/" LIBZ_SO, O_RDONLY); - if (fd_libz < 0) - goto out_error; - - fd_libbz2 = open(_PATH_USR_LIB "/" LIBBZ2_SO, O_RDONLY); - if (fd_libbz2 < 0) - goto out_error; - - fd_libcapability = open(_PATH_USR_LIB "/" LIBCAPABILITY_SO, - O_RDONLY); - if (fd_libcapability < 0) - goto out_error; - - fd_devnull = open(_PATH_DEVNULL, O_RDWR); - if (fd_devnull < 0) - goto out_error; -#endif - if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fd_sockpair) < 0) goto out_error; @@ -357,7 +354,6 @@ return (lch_startfd_flags(fd_sandbox, binname, argv, 0, lcspp)); } -#ifndef IN_CAP_MODE int lch_start_flags(const char *sandbox, char *const argv[], u_int flags, struct lc_sandbox **lcspp) @@ -385,7 +381,6 @@ return (lch_start_flags(sandbox, argv, 0, lcspp)); } -#endif void lch_stop(struct lc_sandbox *lcsp)