d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of nested mountpoints in __getcwd()

Browse Source 
Detected by:	Simon Shapiro <Shimon@i-Connect.Net>
This commit is contained in:
phk 1997-09-28 06:37:02 +00:00
parent 7890a25c74
commit 93c5769c6c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/vfs_extattr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.73 1997/09/24 07:46:54 phk Exp $
* $Id: vfs_syscalls.c,v 1.74 1997/09/27 13:39:06 kato Exp $
*/
/*
@ -2809,6 +2809,10 @@ __getcwd(p, uap, retval)
*bp = '\0';
numcwdcalls++;
for (vp = fdp->fd_cdir; vp != fdp->fd_rdir && vp != rootvnode;) {
if (vp->v_flag & VROOT) {
vp = vp->v_mount->mnt_vnodecovered;
continue;
}
if (vp->v_dd->v_id != vp->v_ddid) {
numcwdfail1++;
free(buf, M_TEMP);
@ -2841,8 +2845,6 @@ __getcwd(p, uap, retval)
*--bp = '/';
j++;
vp = vp->v_dd;
if (vp->v_flag & VROOT)
vp = vp->v_mount->mnt_vnodecovered;
}
if (!j) {
if (bp == buf) {

8
sys/kern/vfs_syscalls.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.73 1997/09/24 07:46:54 phk Exp $
* $Id: vfs_syscalls.c,v 1.74 1997/09/27 13:39:06 kato Exp $
*/
/*
@ -2809,6 +2809,10 @@ __getcwd(p, uap, retval)
*bp = '\0';
numcwdcalls++;
for (vp = fdp->fd_cdir; vp != fdp->fd_rdir && vp != rootvnode;) {
if (vp->v_flag & VROOT) {
vp = vp->v_mount->mnt_vnodecovered;
continue;
}
if (vp->v_dd->v_id != vp->v_ddid) {
numcwdfail1++;
free(buf, M_TEMP);
@ -2841,8 +2845,6 @@ __getcwd(p, uap, retval)
*--bp = '/';
j++;
vp = vp->v_dd;
if (vp->v_flag & VROOT)
vp = vp->v_mount->mnt_vnodecovered;
}
if (!j) {
if (bp == buf) {