Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

description:

Browse Source 
namei_follow() randomly drops foundobj on success. Do that in the
caller instead. On the other hand, the caller was updating cn_nameptr,
and since that's closely related to the buffer manipulation in
namei_follow, do that there.
This commit is contained in:
dholland 2011-04-11 02:19:11 +00:00
parent 13b0ba61c9
commit 080c50860a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/vfs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_lookup.c,v 1.166 2011/04/11 02:18:20 dholland Exp $ */
/* $NetBSD: vfs_lookup.c,v 1.167 2011/04/11 02:19:11 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.166 2011/04/11 02:18:20 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.167 2011/04/11 02:19:11 dholland Exp $");
#include "opt_magiclinks.h"
@ -692,7 +692,9 @@ namei_follow(struct namei_state *state, int inhibitmagic,
ndp->ni_pathlen += linklen;
memcpy(ndp->ni_pnbuf, cp, ndp->ni_pathlen);
PNBUF_PUT(cp);
vput(foundobj);
/* we're now starting from the beginning of the buffer again */
cnp->cn_nameptr = ndp->ni_pnbuf;
/*
* Check if root directory should replace current directory.
@ -1181,7 +1183,8 @@ namei_oneroot(struct namei_state *state, struct vnode *forcecwd,
ndp->ni_vp = NULL;
return error;
}
cnp->cn_nameptr = ndp->ni_pnbuf;
vput(foundobj);
foundobj = NULL;
continue;
}