From owner-p4-projects@FreeBSD.ORG Wed Jun 10 15:27:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B57121065675; Wed, 10 Jun 2009 15:27:37 +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 699F5106568A for ; Wed, 10 Jun 2009 15:27:37 +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 555608FC08 for ; Wed, 10 Jun 2009 15:27:37 +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 n5AFRbwl087489 for ; Wed, 10 Jun 2009 15:27:37 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 n5AFRb7H087487 for perforce@freebsd.org; Wed, 10 Jun 2009 15:27:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Jun 2009 15:27:37 GMT Message-Id: <200906101527.n5AFRb7H087487@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 164008 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: Wed, 10 Jun 2009 15:27:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=164008 Change 164008 by rwatson@rwatson_freebsd_capabilities on 2009/06/10 15:27:00 Pass in libz properly. Don't use original file descriptor numbers after doing lch_installfds. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#4 (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#3 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#4 $ */ #include @@ -110,7 +110,7 @@ if (fds[i] > highestfd) highestfd = fds[i]; } - highestfd++; + highestfd++; /* Don't tread on the highest */ /* * First, move all our descriptors up the range. @@ -156,7 +156,7 @@ return; if (lc_limitfd(fd_ldso, LIBCAPABILITY_CAPMASK_LDSO) < 0) return; - if (lc_limitfd(fd_ldso, LIBCAPABILITY_CAPMASK_LIBC) < 0) + if (lc_limitfd(fd_libc, LIBCAPABILITY_CAPMASK_LIBC) < 0) return; fd_array[0] = fd_devnull; @@ -166,15 +166,16 @@ fd_array[4] = fd_sock; fd_array[5] = fd_ldso; fd_array[6] = fd_libc; + fd_array[7] = fd_libz; - if (lch_installfds(7, fd_array) < 0) + if (lch_installfds(8, fd_array) < 0) return; /* * Pass library list into rtld-elf-cap. */ - if (asprintf(&env_caplibindex, "%d:%s,%d:%s", fd_libc, LIBC_SO, - fd_libz, LIBZ_SO) == -1) + if (asprintf(&env_caplibindex, "%d:%s,%d:%s", 6, LIBC_SO, 7, + LIBZ_SO) == -1) return; if (setenv("LD_CAPLIBINDEX", env_caplibindex, 1) == -1) return; @@ -185,7 +186,7 @@ * assumptions hold. */ if (asprintf(&env_libcapability_agent_api, "%s:%d", - LIBCAPABILITY_AGENT_API_SOCK, fd_sock) == -1) + LIBCAPABILITY_AGENT_API_SOCK, 4) == -1) return; if (setenv(LIBCAPABILITY_AGENT_API_ENV, env_libcapability_agent_api, 1) == -1) @@ -195,7 +196,7 @@ if (cap_enter() < 0) return; - (void)fexecve(fd_ldso, ldso_argv, environ); + (void)fexecve(5, ldso_argv, environ); } int