adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] namei fixes (13/19)

Browse source 
In open_namei() exit_dput: we have mntput() done in the wrong order -
if nd->mnt != path.mnt we end up doing
	mntput(nd->mnt);
	nd->mnt = path.mnt;
	dput(nd->dentry);
	mntput(nd->mnt);
which drops nd->dentry too late.  Fixed by having path.mnt go first.
That allows to switch O_NOFOLLOW under if (__follow_mount(...)) back
to exit_dput, while we are at it.

Fix for early-mntput() race + equivalent transformation.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2005-06-06 13:36:08 -07:00 committed by Linus Torvalds
parent a15a3f6fc6
commit ba7a4c1a76
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/namei.c
View file

@ -1501,11 +1501,8 @@ do_last:
if (__follow_mount(&path)) { if (__follow_mount(&path)) {
error = -ELOOP; error = -ELOOP;
if (flag & O_NOFOLLOW) { if (flag & O_NOFOLLOW)
dput(path.dentry); goto exit_dput;
mntput(path.mnt);
goto exit;
}
} }
error = -ENOENT; error = -ENOENT;
if (!path.dentry->d_inode) if (!path.dentry->d_inode)
@ -1530,8 +1527,7 @@ ok:
exit_dput: exit_dput:
dput(path.dentry); dput(path.dentry);
if (nd->mnt != path.mnt) if (nd->mnt != path.mnt)
mntput(nd->mnt); mntput(path.mnt);
nd->mnt = path.mnt;
exit: exit:
path_release(nd); path_release(nd);
return error; return error;