From owner-p4-projects@FreeBSD.ORG Mon Feb 6 02:54:11 2006 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 9372416A423; Mon, 6 Feb 2006 02:54:10 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 27B5016A420 for ; Mon, 6 Feb 2006 02:54:10 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4D8E43D48 for ; Mon, 6 Feb 2006 02:54:09 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k162s91w099349 for ; Mon, 6 Feb 2006 02:54:09 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k162s9HH099346 for perforce@freebsd.org; Mon, 6 Feb 2006 02:54:09 GMT (envelope-from wsalamon@computer.org) Date: Mon, 6 Feb 2006 02:54:09 GMT Message-Id: <200602060254.k162s9HH099346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91219 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: Mon, 06 Feb 2006 02:54:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=91219 Change 91219 by wsalamon@gretsch on 2006/02/06 02:54:00 Remove comments that are no longer true, leftover from interim development. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#10 (text+ko) ==== @@ -675,10 +675,6 @@ fstype = malloc(MFSNAMELEN, M_TEMP, M_WAITOK); error = copyinstr(uap->type, fstype, MFSNAMELEN, NULL); if (!error) { - /* Audit the fstype here, even though it will be copied - * again later. But if an error is detected, it won't get - * copied later, so grab as much info as possible. - */ AUDIT_ARG(text, fstype); mtx_lock(&Giant); /* XXX ? */ vfsp = vfs_byname_kld(fstype, td, &error); @@ -690,7 +686,7 @@ { /* Even though it will get captured again during vnode lookup, * capture the user-supplied path here because there are several - * error-out cases before the lookup, or the lookup may fail. + * error-out cases before the lookup. */ char *pathbuf = malloc(MNAMELEN, M_TEMP, M_WAITOK); error = copyinstr(uap->path, pathbuf, MNAMELEN, NULL); @@ -712,12 +708,6 @@ ma = mount_argb(ma, !(uap->flags & MNT_NOSUID), "nosuid"); ma = mount_argb(ma, !(uap->flags & MNT_NOEXEC), "noexec"); - /* Note that for auditing purposes, the we depend on the - * file system cmount function to call kernel_mount(), which - * calls vfs_donmount(), and that is where the user path and - * type information is copied into the kernel; only then can - * we capture the path information for auditing. - */ error = vfsp->vfc_vfsops->vfs_cmount(ma, uap->data, uap->flags, td); return (error); }