From owner-p4-projects@FreeBSD.ORG Mon Jun 8 14:24:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52137106567F; Mon, 8 Jun 2009 14:24:27 +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 0E19E106566C for ; Mon, 8 Jun 2009 14:24:27 +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 D2E2F8FC1E for ; Mon, 8 Jun 2009 14:24:26 +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 n58EOQSJ054057 for ; Mon, 8 Jun 2009 14:24:26 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 n58EOQkU054055 for perforce@freebsd.org; Mon, 8 Jun 2009 14:24:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Jun 2009 14:24:26 GMT Message-Id: <200906081424.n58EOQkU054055@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 163786 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: Mon, 08 Jun 2009 14:24:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=163786 Change 163786 by rwatson@rwatson_cinnamon on 2009/06/08 14:23:31 If we're going to allow socketpair(2) in sandboxes, also allow socket(2). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#31 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#31 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#31 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#31 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#31 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#31 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#18 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#17 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#18 $ ## ## @@ -652,8 +652,9 @@ sigwaitinfo ## -## Allow creating new socket pairs with socketpair(2). +## Allow creating new socket pairs with socket(2) and socketpair(2). ## +socket socketpair ## ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#31 (text+ko) ==== @@ -125,7 +125,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 94 = setdopt */ { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 95 = fsync */ { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 96 = setpriority */ - { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, 0 }, /* 97 = socket */ + { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, SYF_CAPENABLED }, /* 97 = socket */ { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0, SYF_CAPENABLED }, /* 98 = connect */ { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED }, /* 99 = old accept */ { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 100 = getpriority */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#31 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#31 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#31 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#31 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#31 (text+ko) ====