i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The symlink traversion didn't balance the ref_count of the starting vnode

Browse Source 
correctly when it entered the next recursion of vnode_path_to_vnode().


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7854 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-08 11:34:49 +00:00
parent c26e46469e
commit e2df52b7da
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/fs/vfs.cpp
+8 -6
View File
@@ -605,10 +605,10 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
status_t status = 0; status_t status = 0;
int type = 0; int type = 0;
FUNCTION(("vnode_path_to_vnode(path = %s)\n", path)); FUNCTION(("vnode_path_to_vnode(vnode = %p, path = %s)\n", vnode, path));
if (!path) if (!path)
return EINVAL; return B_BAD_VALUE;
while (true) { while (true) {
struct vnode *nextVnode; struct vnode *nextVnode;
@@ -632,12 +632,11 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
while (*nextPath == '/'); while (*nextPath == '/');
} }
// See if the .. is at the root of a mount and move to the covered // See if the '..' is at the root of a mount and move to the covered
// vnode so we pass the '..' parse to the underlying filesystem // vnode so we pass the '..' path to the underlying filesystem
if (!strcmp("..", path) if (!strcmp("..", path)
&& vnode->mount->root_vnode == vnode && vnode->mount->root_vnode == vnode
&& vnode->mount->covers_vnode) { && vnode->mount->covers_vnode) {
nextVnode = vnode->mount->covers_vnode; nextVnode = vnode->mount->covers_vnode;
inc_vnode_ref_count(nextVnode); inc_vnode_ref_count(nextVnode);
put_vnode(vnode); put_vnode(vnode);
@@ -718,6 +717,9 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
vnode = sRoot; vnode = sRoot;
inc_vnode_ref_count(vnode); inc_vnode_ref_count(vnode);
} }
inc_vnode_ref_count(vnode);
// balance the next recursion - we will decrement the ref_count
// of the vnode, no matter if we succeeded or not
status = vnode_path_to_vnode(vnode, path, traverseLeafLink, count + 1, &nextVnode, _type); status = vnode_path_to_vnode(vnode, path, traverseLeafLink, count + 1, &nextVnode, _type);
@@ -760,7 +762,7 @@ path_to_vnode(char *path, bool traverseLink, struct vnode **_vnode, bool kernel)
FUNCTION(("path_to_vnode(path = \"%s\")\n", path)); FUNCTION(("path_to_vnode(path = \"%s\")\n", path));
if (!path) if (!path)
return EINVAL; return B_BAD_VALUE;
// figure out if we need to start at root or at cwd // figure out if we need to start at root or at cwd
if (*path == '/') { if (*path == '/') {