Commit a15a3f6f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] namei fixes (12/19)



In open_namei() we take mntput(nd->mnt);nd->mnt=path.mnt; out of the if
(__follow_mount(...)), making it conditional on nd->mnt != path.mnt instead.

Then we shift the result downstream.

Equivalent transformations.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2f12dbfb
...@@ -1506,8 +1506,6 @@ do_last: ...@@ -1506,8 +1506,6 @@ do_last:
mntput(path.mnt); mntput(path.mnt);
goto exit; goto exit;
} }
mntput(nd->mnt);
nd->mnt = path.mnt;
} }
error = -ENOENT; error = -ENOENT;
if (!path.dentry->d_inode) if (!path.dentry->d_inode)
...@@ -1517,6 +1515,9 @@ do_last: ...@@ -1517,6 +1515,9 @@ do_last:
dput(nd->dentry); dput(nd->dentry);
nd->dentry = path.dentry; nd->dentry = path.dentry;
if (nd->mnt != path.mnt)
mntput(nd->mnt);
nd->mnt = path.mnt;
error = -EISDIR; error = -EISDIR;
if (path.dentry->d_inode && S_ISDIR(path.dentry->d_inode->i_mode)) if (path.dentry->d_inode && S_ISDIR(path.dentry->d_inode->i_mode))
goto exit; goto exit;
...@@ -1528,6 +1529,9 @@ ok: ...@@ -1528,6 +1529,9 @@ ok:
exit_dput: exit_dput:
dput(path.dentry); dput(path.dentry);
if (nd->mnt != path.mnt)
mntput(nd->mnt);
nd->mnt = path.mnt;
exit: exit:
path_release(nd); path_release(nd);
return error; return error;
...@@ -1550,6 +1554,9 @@ do_link: ...@@ -1550,6 +1554,9 @@ do_link:
error = security_inode_follow_link(path.dentry, nd); error = security_inode_follow_link(path.dentry, nd);
if (error) if (error)
goto exit_dput; goto exit_dput;
if (nd->mnt != path.mnt)
mntput(nd->mnt);
nd->mnt = path.mnt;
error = __do_follow_link(&path, nd); error = __do_follow_link(&path, nd);
if (error) if (error)
return error; return error;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment