svn commit: r254444 - stable/9/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sat Aug 17 08:31:34 2013
New Revision: 254444
URL: http://svnweb.freebsd.org/changeset/base/254444

Log:
  MFC r253969:
  Do not override the ENOENT error for the empty path, or EFAULT errors
  from copyins, with the relative lookup check.

Modified:
  stable/9/sys/kern/vfs_lookup.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_lookup.c
==============================================================================
--- stable/9/sys/kern/vfs_lookup.c	Sat Aug 17 08:08:58 2013	(r254443)
+++ stable/9/sys/kern/vfs_lookup.c	Sat Aug 17 08:31:34 2013	(r254444)
@@ -175,7 +175,7 @@ namei(struct nameidata *ndp)
 	 * not an absolute path, and not containing '..' components) to
 	 * a real file descriptor, not the pseudo-descriptor AT_FDCWD.
 	 */
-	if (IN_CAPABILITY_MODE(td)) {
+	if (error = 0 && IN_CAPABILITY_MODE(td)) {
 		ndp->ni_strictrelative = 1;
 		if (ndp->ni_dirfd == AT_FDCWD)
 			error = ECAPMODE;