From owner-trustedbsd-cvs@FreeBSD.ORG Mon Dec 11 22:16:37 2006 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 97AB816A51F for ; Mon, 11 Dec 2006 22:16:37 +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 2A6E74412C for ; Mon, 11 Dec 2006 22:09:39 +0000 (GMT) (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 5A1FF46B13 for ; Mon, 11 Dec 2006 17:10:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id AD08014BB6F; Mon, 11 Dec 2006 22:06:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AE8C16A407; Mon, 11 Dec 2006 22:06:11 +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 A919B16A4D2 for ; Mon, 11 Dec 2006 22:06:11 +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 1613244574 for ; Mon, 11 Dec 2006 21:44:33 +0000 (GMT) (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 kBBLjYuC097793 for ; Mon, 11 Dec 2006 21:45:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLjYgX097790 for perforce@freebsd.org; Mon, 11 Dec 2006 21:45:34 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:45:34 GMT Message-Id: <200612112145.kBBLjYgX097790@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 111492 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: Mon, 11 Dec 2006 22:16:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=111492 Change 111492 by millert@millert_g5tower on 2006/12/11 21:45:22 Comment out vnode_getattr() call for now as it leads to deadlock. This means we can no longer report the inode in avc log messages. The path info still remains (for now). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#16 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#16 (text+ko) ==== @@ -639,6 +639,7 @@ char *path = a->u.fs.path; int pathlen = a->u.fs.pathlen; struct vnode *vp = a->u.fs.vp; +#if 0 struct vnode_attr va; struct vfs_context vfs_ctx = { tsk, tsk->p_ucred }; @@ -648,6 +649,11 @@ audit_log_format(ab, " inode=%llu, " "mountpoint=%s,", va.va_fileid, vp->v_mount->mnt_vfsstat.f_mntonname); +#else + if (vp != NULL) { + audit_log_format(ab, "mountpoint=%s,", + vp->v_mount->mnt_vfsstat.f_mntonname); +#endif if (path == NULL) { pathlen = MAXPATHLEN; pbuf = sebsd_malloc(MAXPATHLEN,