提交 f488443d 编写于 作者: A Al Viro

namei: take O_NOFOLLOW treatment into do_last()

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 34b128f3
...@@ -3059,6 +3059,11 @@ static int do_last(struct nameidata *nd, struct path *path, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册