From owner-p4-projects@FreeBSD.ORG Mon Jan 19 18:54:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D14061065679; Mon, 19 Jan 2009 18:54:35 +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 8EEAE1065672 for ; Mon, 19 Jan 2009 18:54:35 +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 61C1B8FC0A for ; Mon, 19 Jan 2009 18:54:35 +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 n0JIsZDX014109 for ; Mon, 19 Jan 2009 18:54:35 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 n0JIsZaP014107 for perforce@freebsd.org; Mon, 19 Jan 2009 18:54:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Jan 2009 18:54:35 GMT Message-Id: <200901191854.n0JIsZaP014107@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 156400 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, 19 Jan 2009 18:54:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=156400 Change 156400 by rwatson@rwatson_freebsd_capabilities on 2009/01/19 18:53:48 Since we have CAP_IOCTL, allow ioctl() in capability mode, subject to the capability being set. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#16 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#26 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#16 (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#15 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#16 $ ## ## @@ -326,7 +326,7 @@ ## ## XXXRW: This needs to be revisited. ## -#ioctl +ioctl ## ## Allow querying current process credential state. ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#26 (text+ko) ==== @@ -82,7 +82,7 @@ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 52 = old sigpending */ { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED }, /* 53 = sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = ioctl */ + { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#26 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#26 (text+ko) ====