From owner-p4-projects@FreeBSD.ORG Tue Jan 13 21:59:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2884F1065673; Tue, 13 Jan 2009 21:59:53 +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 D9E231065670 for ; Tue, 13 Jan 2009 21:59:52 +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 AA8FF8FC1B for ; Tue, 13 Jan 2009 21:59:52 +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 n0DLxqiR015402 for ; Tue, 13 Jan 2009 21:59:52 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 n0DLxqoa015400 for perforce@freebsd.org; Tue, 13 Jan 2009 21:59:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 21:59:52 GMT Message-Id: <200901132159.n0DLxqoa015400@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 156116 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, 13 Jan 2009 21:59:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=156116 Change 156116 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 21:59:41 Add CAP_SOCK_ALL, a mask of all capabilities that may be used with sockets, and use it when a socket gets used by the NFS server. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_srvkrpc.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_syscalls.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#18 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_srvkrpc.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_kgssapi.h" #include +#include #include #include #include @@ -187,7 +188,8 @@ sizeof(addsockarg)); if (error) return (error); - if ((error = fget(td, addsockarg.sock, &fp)) != 0) + if ((error = fget(td, addsockarg.sock, CAP_SOCK_ALL, &fp)) + != 0) return (error); if (fp->f_type != DTYPE_SOCKET) { fdrop(fp, td); ==== //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_syscalls.c#6 (text+ko) ==== @@ -152,12 +152,7 @@ error = copyin(uap->argp, (caddr_t)&nfsdarg, sizeof(nfsdarg)); if (error) return (error); - /* - * XXXRW: Really want CAP_SOCK_ALL? - */ - if ((error = fget(td, nfsdarg.sock, CAP_READ | CAP_WRITE | - CAP_GETSOCKNAME | CAP_BIND | CAP_CONNECT | CAP_EVENT, - &fp)) != 0) + if ((error = fget(td, nfsdarg.sock, CAP_SOCK_ALL, &fp)) != 0) return (error); if (fp->f_type != DTYPE_SOCKET) { fdrop(fp, td); ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#18 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Robert N. M. Watson + * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. * * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -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/sys/sys/capability.h#17 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#18 $ */ /* @@ -116,6 +116,18 @@ * Socket checks don't generally pass CAP_SEEK but perhaps should? */ +/* + * A mask of multiple capabilities useful for situation where a socket will + * be used in a general-purpose way by the kernel, such as a socket used by + * the NFS server. + */ +#define CAP_SOCK_ALL (CAP_READ | CAP_WRITE | CAP_SEEK | CAP_GETPEERNAME | \ + CAP_GETSOCKNAME | CAP_IOCTL | CAP_FSTAT | \ + CAP_FCNTL | CAP_EVENT | CAP_ACCEPT | \ + CAP_CONNECT | CAP_BIND | CAP_GETSOCKOPT | \ + CAP_SETSOCKOPT | CAP_LISTEN | CAP_SHUTDOWN | \ + CAP_PEELOFF) + #ifdef _KERNEL struct file;