From owner-p4-projects@FreeBSD.ORG Fri Apr 20 11:39:01 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 8E8AD16A406; Fri, 20 Apr 2007 11:39:01 +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 34A8516A400 for ; Fri, 20 Apr 2007 11:39:01 +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 23C4413C468 for ; Fri, 20 Apr 2007 11:39:01 +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 l3KBd1sj081012 for ; Fri, 20 Apr 2007 11:39:01 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 l3KBd0M5081005 for perforce@freebsd.org; Fri, 20 Apr 2007 11:39:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Apr 2007 11:39:00 GMT Message-Id: <200704201139.l3KBd0M5081005@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 118464 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 11:39:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=118464 Change 118464 by rwatson@rwatson_zoo on 2007/04/20 11:38:00 Move audit-related MAC check definitions from old mac_policy (now removed) to new mac_policy.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#3 (text+ko) ==== @@ -607,6 +607,21 @@ typedef int (*mpo_priv_check_t)(struct ucred *cred, int priv); typedef int (*mpo_priv_grant_t)(struct ucred *cred, int priv); +/* + * XXXRW: Audit checks should be above, but list them here to make a more + * sensible diff for now. + */ +typedef int (*mpo_check_system_audit_t)(struct ucred *cred, void *record, + int length); +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); + struct mac_policy_ops { /* * Policy module operations. @@ -902,6 +917,18 @@ mpo_create_mbuf_from_syncache_t mpo_create_mbuf_from_syncache; mpo_priv_check_t mpo_priv_check; mpo_priv_grant_t mpo_priv_grant; + + /* + * XXXRW: Audit checks should be above, but list them here to make a + * more sensible diff for now. + */ + 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; }; /*