From owner-p4-projects@FreeBSD.ORG Fri Apr 20 14:27:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E443616A403; Fri, 20 Apr 2007 14:27:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B968C16A401 for ; Fri, 20 Apr 2007 14:27:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A820113C46E for ; Fri, 20 Apr 2007 14:27:39 +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.13.8/8.13.8) with ESMTP id l3KERdxB020444 for ; Fri, 20 Apr 2007 14:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KERdtP020441 for perforce@freebsd.org; Fri, 20 Apr 2007 14:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 14:27:39 GMT Message-Id: <200704201427.l3KERdtP020441@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 118475 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: Fri, 20 Apr 2007 14:27:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=118475 Change 118475 by rwatson@rwatson_zoo on 2007/04/20 14:26:55 Don't add MAC checks for audit calls where there is no further information available than via the existing privilege checks (which can also be instrumented with MAC). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#35 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#7 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#35 (text+ko) ==== @@ -444,12 +444,6 @@ int error; au_id_t id; -#ifdef MAC - error = mac_check_proc_getauid(td->td_ucred); - if (error) - return (error); -#endif - if (jailed(td->td_ucred)) return (ENOSYS); error = priv_check(td, PRIV_AUDIT_GETAUDIT); @@ -518,12 +512,6 @@ struct auditinfo ai; int error; -#ifdef MAC - error = mac_check_proc_getaudit(td->td_ucred); - if (error) - return (error); -#endif - if (jailed(td->td_ucred)) return (ENOSYS); error = priv_check(td, PRIV_AUDIT_GETAUDIT); @@ -594,12 +582,6 @@ struct auditinfo_addr aia; int error; -#ifdef MAC - error = mac_check_proc_getaudit(td->td_ucred); - if (error) - return (error); -#endif - if (jailed(td->td_ucred)) return (ENOSYS); error = priv_check(td, PRIV_AUDIT_GETAUDIT); ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#7 (text+ko) ==== @@ -81,16 +81,6 @@ } int -mac_check_proc_getauid(struct ucred *cred) -{ - int error; - - MAC_CHECK(check_proc_getauid, cred); - - return (error); -} - -int mac_check_proc_setauid(struct ucred *cred, uid_t auid) { int error; @@ -101,16 +91,6 @@ } int -mac_check_proc_getaudit(struct ucred *cred) -{ - int error; - - MAC_CHECK(check_proc_getaudit, cred); - - return (error); -} - -int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) { int error; ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#5 (text+ko) ==== @@ -423,9 +423,7 @@ int mac_check_system_audit(struct ucred *cred, void *record, int length); int mac_check_system_auditon(struct ucred *cred, int cmd); int mac_check_system_auditctl(struct ucred *cred, struct vnode *vp); -int mac_check_proc_getauid(struct ucred *cred); int mac_check_proc_setauid(struct ucred *cred, uid_t auid); -int mac_check_proc_getaudit(struct ucred *cred); int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai); /* ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#5 (text+ko) ==== @@ -617,9 +617,7 @@ typedef int (*mpo_check_system_auditon_t)(struct ucred *cred, int cmd); typedef int (*mpo_check_system_auditctl_t)(struct ucred *cred, struct vnode *vp, struct label *vplabel); -typedef int (*mpo_check_proc_getauid_t)(struct ucred *cred); typedef int (*mpo_check_proc_setauid_t)(struct ucred *cred, uid_t auid); -typedef int (*mpo_check_proc_getaudit_t)(struct ucred *cred); typedef int (*mpo_check_proc_setaudit_t)(struct ucred *cred, struct auditinfo *ai); @@ -926,9 +924,7 @@ mpo_check_system_audit_t mpo_check_system_audit; mpo_check_system_auditon_t mpo_check_system_auditon; mpo_check_system_auditctl_t mpo_check_system_auditctl; - mpo_check_proc_getauid_t mpo_check_proc_getauid; mpo_check_proc_setauid_t mpo_check_proc_setauid; - mpo_check_proc_getaudit_t mpo_check_proc_getaudit; mpo_check_proc_setaudit_t mpo_check_proc_setaudit; };