svn commit: r208676 - stable/8/sys/kern

[Robert Watson]

Author: rwatson
Date: Mon May 31 21:57:31 2010
New Revision: 208676
URL: http://svn.freebsd.org/changeset/base/208676

Log:
  Merge r203410 from head to stable/8:
  
   Only audit pathnames in namei(9) if copying the directory string completes
   successfully.  Continue to do this before the empty path check so that the
   ENOENT returned in that case gets an empty string token in the BSM record.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/kern/vfs_lookup.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/kern/vfs_lookup.c
==============================================================================
--- stable/8/sys/kern/vfs_lookup.c	Mon May 31 21:35:40 2010	(r208675)
+++ stable/8/sys/kern/vfs_lookup.c	Mon May 31 21:57:31 2010	(r208676)
@@ -162,11 +162,16 @@ namei(struct nameidata *ndp)
 		error = copyinstr(ndp->ni_dirp, cnp->cn_pnbuf,
 			    MAXPATHLEN, (size_t *)&ndp->ni_pathlen);
 
-	/* If we are auditing the kernel pathname, save the user pathname. */
-	if (cnp->cn_flags & AUDITVNODE1)
-		AUDIT_ARG_UPATH1(td, cnp->cn_pnbuf);
-	if (cnp->cn_flags & AUDITVNODE2)
-		AUDIT_ARG_UPATH2(td, cnp->cn_pnbuf);
+	if (error == 0) {
+		/*
+		 * If we are auditing the kernel pathname, save the user
+		 * pathname.
+		 */
+		if (cnp->cn_flags & AUDITVNODE1)
+			AUDIT_ARG_UPATH1(td, cnp->cn_pnbuf);
+		if (cnp->cn_flags & AUDITVNODE2)
+			AUDIT_ARG_UPATH2(td, cnp->cn_pnbuf);
+	}
 
 	/*
 	 * Don't allow empty pathnames.