korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

do_last: regularize the logics around following symlinks

Browse Source 
With LOOKUP_FOLLOW we unlazy and return 1; without it we either
fail with ELOOP or, for O_PATH opens, succeed.  No need to mix
those cases...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-04-22 12:10:45 -04:00
parent fd2805be23
commit a5cfe2d5e1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/namei.c
View File

@ -3046,9 +3046,7 @@ retry_lookup:
goto out;
}
finish_lookup:
/* we _can_ be in RCU mode here */
if (should_follow_link(path->dentry,
!(open_flag & O_PATH) || (nd->flags & LOOKUP_FOLLOW))) {
if (should_follow_link(path->dentry, nd->flags & LOOKUP_FOLLOW)) {
if (nd->flags & LOOKUP_RCU) {
if (unlikely(nd->path.mnt != path->mnt ||
unlazy_walk(nd, path->dentry))) {
@ -3057,14 +3055,15 @@ finish_lookup:
}
}
BUG_ON(inode != path->dentry->d_inode);
if (!(nd->flags & LOOKUP_FOLLOW)) {
path_put_conditional(path, nd);
path_put(&nd->path);
return -ELOOP;
}
return 1;
}
if (unlikely(d_is_symlink(path->dentry)) && !(open_flag & O_PATH)) {
path_to_nameidata(path, nd);
error = -ELOOP;
goto out;
}
if ((nd->flags & LOOKUP_RCU) || nd->path.mnt != path->mnt) {
path_to_nameidata(path, nd);
} else {