CVS commit: src/sys/kern

[David A. Holland]

Module Name:    src
Committed By:   dholland
Date:           Mon Apr 11 02:16:27 UTC 2011

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

Log Message:
description:
Ensure we don't leak stale pointers out in ni_dvp or ni_vp on error return.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 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.158 src/sys/kern/vfs_lookup.c:1.159
--- src/sys/kern/vfs_lookup.c:1.158	Mon Apr 11 02:16:07 2011
+++ src/sys/kern/vfs_lookup.c	Mon Apr 11 02:16:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_lookup.c,v 1.158 2011/04/11 02:16:07 dholland Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.159 2011/04/11 02:16:27 dholland Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.158 2011/04/11 02:16:07 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.159 2011/04/11 02:16:27 dholland Exp $");
 
 #include "opt_magiclinks.h"
 
@@ -1377,6 +1377,12 @@
 				  0/*!neverfollow*/, 0/*!inhibitmagic*/);
 	namei_cleanup(&state);
 
+	if (error) {
+		/* make sure no stray refs leak out */
+		ndp->ni_dvp = NULL;
+		ndp->ni_vp = NULL;
+	}
+
 	return error;
 }
 
@@ -1407,6 +1413,12 @@
 				  neverfollow, 1/*inhibitmagic*/);
 	namei_cleanup(&state);
 
+	if (error) {
+		/* make sure no stray refs leak out */
+		ndp->ni_dvp = NULL;
+		ndp->ni_vp = NULL;
+	}
+
 	return error;
 }