openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

namei: take O_NOFOLLOW treatment into do_last() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-04-22 11:27:43 -04:00
parent 34b128f31c
commit f488443d1d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/namei.c
View File

@ -3059,6 +3059,11 @@ static int do_last(struct nameidata *nd, struct path *path,
} }
} }
BUG_ON(inode != path->dentry->d_inode); 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; return 1;
} }
@ -3243,12 +3248,6 @@ static struct file *path_openat(int dfd, struct filename *pathname,
while (unlikely(error > 0)) { /* trailing symlink */ while (unlikely(error > 0)) { /* trailing symlink */
struct path link = path; struct path link = path;
void *cookie; void *cookie;
if (!(nd->flags & LOOKUP_FOLLOW)) {
path_put_conditional(&path, nd);
path_put(&nd->path);
error = -ELOOP;
break;
}
error = may_follow_link(&link, nd); error = may_follow_link(&link, nd);
if (unlikely(error)) if (unlikely(error))
break; break;