From owner-p4-projects Sat Oct 26 21: 6:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85CB137B404; Sat, 26 Oct 2002 21:06:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30FB637B401 for ; Sat, 26 Oct 2002 21:06:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C02D543E42 for ; Sat, 26 Oct 2002 21:06:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9R458mV064894 for ; Sat, 26 Oct 2002 21:05:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9R458Bv064891 for perforce@freebsd.org; Sat, 26 Oct 2002 21:05:08 -0700 (PDT) Date: Sat, 26 Oct 2002 21:05:08 -0700 (PDT) Message-Id: <200210270405.g9R458Bv064891@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 Subject: PERFORCE change 20227 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20227 Change 20227 by rwatson@rwatson_tislabs on 2002/10/26 21:04:52 Integ _system_ check namespace changes into lomac from biba. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#22 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#22 (text+ko) ==== @@ -334,6 +334,7 @@ static int mac_lomac_high_single(struct mac_lomac *mac_lomac) { + KASSERT((mac_lomac->ml_flags & MAC_LOMAC_FLAG_SINGLE) != 0, ("mac_lomac_high_single: mac_lomac not single")); @@ -1912,8 +1913,28 @@ } static int -mac_lomac_check_sysctl(struct ucred *cred, int *name, u_int namelen, - void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) +mac_lomac_check_vnode_swapon(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_lomac_subject_privileged(subj)) + return (EPERM); + + if (!mac_lomac_high_single(obj)) + return (EACCES); + + return (0); +} + +static int +mac_lomac_check_system_sysctl(struct ucred *cred, int *name, u_int namelen, { struct mac_lomac *subj; @@ -2397,27 +2418,6 @@ } static int -mac_lomac_check_vnode_swapon(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - if (!mac_lomac_subject_privileged(subj)) - return (EPERM); - - if (!mac_lomac_high_single(obj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -2670,9 +2670,11 @@ { MAC_CHECK_SOCKET_RELABEL, (macop_t)mac_lomac_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, - (macop_t)mac_lomac_check_socket_visible }, - { MAC_CHECK_SYSCTL, - (macop_t)mac_lomac_check_sysctl }, + (macop_t)mac_loamc_check_socket_visible }, + { MAC_CHECK_SYSTEM_SWAPON, + (macop_t)mac_lomac_check_system_swapon }, + { MAC_CHECK_SYSTEM_SYSCTL, + (macop_t)mac_lomac_check_system_sysctl }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_lomac_check_vnode_open }, { MAC_CHECK_VNODE_CREATE, @@ -2713,8 +2715,6 @@ (macop_t)mac_lomac_check_vnode_setowner }, { MAC_CHECK_VNODE_SETUTIMES, (macop_t)mac_lomac_check_vnode_setutimes }, - { MAC_CHECK_VNODE_SWAPON, - (macop_t)mac_lomac_check_vnode_swapon }, { MAC_CHECK_VNODE_WRITE, (macop_t)mac_lomac_check_vnode_write }, { MAC_THREAD_USERRET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message