CVS commit: src/sys/kern

[Juergen Hannken-Illjes]

Module Name:    src
Committed By:   hannken
Date:           Sun Mar 17 10:14:52 UTC 2019

Modified Files:
        src/sys/kern: vfs_lookup.c

Log Message:
With TRYEMULROOT namei_getstartdir() gets used twice so have to
vrele() "ni_rootdir" and "ni_erootdir" on entry.


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/kern/vfs_lookup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.209 src/sys/kern/vfs_lookup.c:1.210
--- src/sys/kern/vfs_lookup.c:1.209	Tue Mar 12 14:03:35 2019
+++ src/sys/kern/vfs_lookup.c	Sun Mar 17 10:14:52 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_lookup.c,v 1.209 2019/03/12 14:03:35 hannken Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.210 2019/03/17 10:14:52 hannken Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.209 2019/03/12 14:03:35 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.210 2019/03/17 10:14:52 hannken Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_magiclinks.h"
@@ -537,6 +537,13 @@ namei_getstartdir(struct namei_state *st
 	struct lwp *self = curlwp;	/* thread doing namei() */
 	struct vnode *rootdir, *erootdir, *curdir, *startdir;
 
+	if (state->root_referenced) {
+		vrele(state->ndp->ni_rootdir);
+		if (state->ndp->ni_erootdir != NULL)
+			vrele(state->ndp->ni_erootdir);
+		state->root_referenced = 0;
+	}
+
 	cwdi = self->l_proc->p_cwdi;
 	rw_enter(&cwdi->cwdi_lock, RW_READER);
 
@@ -589,7 +596,6 @@ namei_getstartdir(struct namei_state *st
 	 * A multithreaded process may chroot during namei.
 	 */
 	vref(startdir);
-	KASSERT(! state->root_referenced);
 	vref(state->ndp->ni_rootdir);
 	if (state->ndp->ni_erootdir != NULL)
 		vref(state->ndp->ni_erootdir);