From owner-p4-projects@FreeBSD.ORG Sat Jul 25 11:23:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 696911065674; Sat, 25 Jul 2009 11:23:34 +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 25EDC1065670 for ; Sat, 25 Jul 2009 11:23:34 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 13FFD8FC18 for ; Sat, 25 Jul 2009 11:23:34 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6PBNX5B084936 for ; Sat, 25 Jul 2009 11:23:33 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6PBNXlg084934 for perforce@freebsd.org; Sat, 25 Jul 2009 11:23:33 GMT (envelope-from jona@FreeBSD.org) Date: Sat, 25 Jul 2009 11:23:33 GMT Message-Id: <200907251123.n6PBNXlg084934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Cc: Subject: PERFORCE change 166550 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: Sat, 25 Jul 2009 11:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=166550 Change 166550 by jona@jona-trustedbsd-belle-vmware on 2009/07/25 11:22:58 This seems to be the right place to unwrap capability file structs Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#14 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#26 (text+ko) ==== @@ -404,7 +404,7 @@ } static inline struct file * -fdtofp(int fd, struct filedesc *fdp) +fdtofp(int fd, cap_rights_t rights, struct filedesc *fdp) { struct file *fp; @@ -412,6 +412,13 @@ if ((unsigned)fd >= fdp->fd_nfiles || (fp = fdp->fd_ofiles[fd]) == NULL) return (NULL); + +#ifdef CAPABILITIES + if (fp->f_type == DTYPE_CAPABILITY) + if(cap_fextract(fp, rights, &fp)) + return (NULL); +#endif /* CAPABILITIES */ + return (fp); } @@ -446,7 +453,7 @@ case F_GETFD: FILEDESC_SLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_READ, fdp)) == NULL) { FILEDESC_SUNLOCK(fdp); error = EBADF; break; @@ -458,7 +465,7 @@ case F_SETFD: FILEDESC_XLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_WRITE, fdp)) == NULL) { FILEDESC_XUNLOCK(fdp); error = EBADF; break; @@ -471,7 +478,7 @@ case F_GETFL: FILEDESC_SLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_READ, fdp)) == NULL) { FILEDESC_SUNLOCK(fdp); error = EBADF; break; @@ -482,7 +489,7 @@ case F_SETFL: FILEDESC_SLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_FCHFLAGS, fdp)) == NULL) { FILEDESC_SUNLOCK(fdp); error = EBADF; break; @@ -514,7 +521,7 @@ case F_GETOWN: FILEDESC_SLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_READ, fdp)) == NULL) { FILEDESC_SUNLOCK(fdp); error = EBADF; break; @@ -529,7 +536,7 @@ case F_SETOWN: FILEDESC_SLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_FCHOWN, fdp)) == NULL) { FILEDESC_SUNLOCK(fdp); error = EBADF; break; @@ -555,7 +562,7 @@ case F_SETLK: do_setlk: FILEDESC_SLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_FLOCK, fdp)) == NULL) { FILEDESC_SUNLOCK(fdp); error = EBADF; break; @@ -650,7 +657,7 @@ case F_GETLK: FILEDESC_SLOCK(fdp); - if ((fp = fdtofp(fd, fdp)) == NULL) { + if ((fp = fdtofp(fd, CAP_FLOCK, fdp)) == NULL) { FILEDESC_SUNLOCK(fdp); error = EBADF; break; ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#14 (text+ko) ==== @@ -44,10 +44,6 @@ #include #include -#ifdef CAPABILITIES -#include -#endif /* CAPABILITIES */ - struct stat; struct thread; struct uio; @@ -276,20 +272,7 @@ struct ucred *active_cred; struct thread *td; { - struct file *p = fp; - -#ifdef CAPABILITIES - int error; - - if (fp->f_type == DTYPE_CAPABILITY) - { - error = cap_fextract(fp, CAP_IOCTL, &p); - if (error) - return error; - } -#endif /* CAPABILITIES */ - - return ((*p->f_ops->fo_ioctl)(p, com, data, active_cred, td)); + return ((*fp->f_ops->fo_ioctl)(fp, com, data, active_cred, td)); } static __inline int