From owner-svn-src-projects@FreeBSD.ORG Tue Jun 1 15:01:02 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CB2A1065676; Tue, 1 Jun 2010 15:01:02 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 525F68FC1D; Tue, 1 Jun 2010 15:01:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o51F12uK064468; Tue, 1 Jun 2010 15:01:02 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o51F12Kk064464; Tue, 1 Jun 2010 15:01:02 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201006011501.o51F12Kk064464@svn.freebsd.org> From: Robert Watson Date: Tue, 1 Jun 2010 15:01:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208708 - projects/capabilities8/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 15:01:02 -0000 Author: rwatson Date: Tue Jun 1 15:01:02 2010 New Revision: 208708 URL: http://svn.freebsd.org/changeset/base/208708 Log: Merge r178261 from the p4 TrustedBSD capabilities branch to capabilities8: Allow fstatat() in capability mode. Submitted by: jona Modified: projects/capabilities8/sys/kern/capabilities.conf projects/capabilities8/sys/kern/init_sysent.c projects/capabilities8/sys/kern/vfs_syscalls.c Modified: projects/capabilities8/sys/kern/capabilities.conf ============================================================================== --- projects/capabilities8/sys/kern/capabilities.conf Tue Jun 1 14:54:50 2010 (r208707) +++ projects/capabilities8/sys/kern/capabilities.conf Tue Jun 1 15:01:02 2010 (r208708) @@ -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#26 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#27 $ ## ## @@ -457,6 +457,7 @@ olio_listio ## files which are not "under" the directory FD given to the syscall. ## faccessat +fstatat fchmodat futimesat mkdirat Modified: projects/capabilities8/sys/kern/init_sysent.c ============================================================================== --- projects/capabilities8/sys/kern/init_sysent.c Tue Jun 1 14:54:50 2010 (r208707) +++ projects/capabilities8/sys/kern/init_sysent.c Tue Jun 1 15:01:02 2010 (r208708) @@ -527,7 +527,7 @@ struct sysent sysent[] = { { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, SYF_CAPENABLED }, /* 490 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 491 = fchownat */ { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED }, /* 492 = fexecve */ - { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0 }, /* 493 = fstatat */ + { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED }, /* 493 = fstatat */ { AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED }, /* 494 = futimesat */ { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0 }, /* 495 = linkat */ { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0, SYF_CAPENABLED }, /* 496 = mkdirat */ Modified: projects/capabilities8/sys/kern/vfs_syscalls.c ============================================================================== --- projects/capabilities8/sys/kern/vfs_syscalls.c Tue Jun 1 14:54:50 2010 (r208707) +++ projects/capabilities8/sys/kern/vfs_syscalls.c Tue Jun 1 15:01:02 2010 (r208708) @@ -2425,9 +2425,9 @@ kern_statat_vnhook(struct thread *td, in if (flag & ~AT_SYMLINK_NOFOLLOW) return (EINVAL); - NDINIT_AT(&nd, LOOKUP, ((flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : + NDINIT_ATRIGHTS(&nd, LOOKUP, ((flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW) | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, - path, fd, td); + path, fd, CAP_FSTAT | CAP_ATBASE, td); if ((error = namei(&nd)) != 0) return (error);