From owner-trustedbsd-cvs@FreeBSD.ORG Sun Jan 21 22:33:48 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1B6BB16A551 for ; Sun, 21 Jan 2007 22:33:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id C74A813C45E for ; Sun, 21 Jan 2007 22:33:45 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id C0C5F480B5 for ; Sun, 21 Jan 2007 17:33:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 3440F92E75; Sun, 21 Jan 2007 22:29:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BD1516A40A; Sun, 21 Jan 2007 22:29:26 +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 E53C316A404 for ; Sun, 21 Jan 2007 22:29:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 91D0413C45D for ; Sun, 21 Jan 2007 22:29:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LMTLZc060650 for ; Sun, 21 Jan 2007 22:29:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMTLS7060647 for perforce@freebsd.org; Sun, 21 Jan 2007 22:29:21 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:29:21 GMT Message-Id: <200701212229.l0LMTLS7060647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 113273 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jan 2007 22:33:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=113273 Change 113273 by millert@millert_macbook on 2007/01/21 22:28:33 The call to mac_file_check_create() should be placed where the other checks are done. This makes the fdlock handling consistent. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_acct.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_acct.c#5 (text+ko) ==== @@ -167,6 +167,15 @@ NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, &context); if ((error = vn_open(&nd, FWRITE, 0))) return (error); +#ifdef MAC + error = mac_system_check_acct(vfs_context_ucred(&context), + nd.ni_vp); + if (error) { + vnode_put(nd.ni_vp); + vn_close(nd.ni_vp, FWRITE, kauth_cred_get(), p); + return (error); + } +#endif vnode_put(nd.ni_vp); if (nd.ni_vp->v_type != VREG) { @@ -175,17 +184,8 @@ } } #ifdef MAC - if (uap->path != USER_ADDR_NULL) { - vnode_lock(nd.ni_vp); - error = mac_system_check_acct(p->p_ucred, nd.ni_vp); - vnode_unlock(nd.ni_vp); - if (error) { - vn_close(nd.ni_vp, FWRITE, kauth_cred_get(), p); - return (error); - } - } else { - error = mac_system_check_acct(p->p_ucred, NULL); + error = mac_system_check_acct(vfs_context_ucred(&context), NULL); if (error) return (error); }