summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-07-14 12:19:57 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2019-07-21 18:24:45 -0400
commit39145f5f0cc924b494ad55a2bc9c1b4969b5a038 (patch)
tree559d3b73c4a7658cafc3eca00412793618f035f8 /fs
parentff0ebee239ce3461cab68ebb8e1a359fc34329de (diff)
filename_mountpoint(): make LOOKUP_NO_EVAL unconditional there
user_path_mountpoint_at() always gets it and the reasons to have it there (i.e. in umount(2)) apply to kern_path_mountpoint() callers as well. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c2
-rw-r--r--fs/namespace.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 83e5fb3fad76..5b8c72dc0217 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2718,7 +2718,7 @@ filename_mountpoint(int dfd, struct filename *name, struct path *path,
if (unlikely(error == -ESTALE))
error = path_mountpoint(&nd, flags | LOOKUP_REVAL, path);
if (likely(!error))
- audit_inode(name, path->dentry, flags & LOOKUP_NO_EVAL);
+ audit_inode(name, path->dentry, LOOKUP_NO_EVAL);
restore_nameidata();
putname(name);
return error;
diff --git a/fs/namespace.c b/fs/namespace.c
index 6464ea4acba9..697f8820dff5 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1675,8 +1675,6 @@ int ksys_umount(char __user *name, int flags)
if (!(flags & UMOUNT_NOFOLLOW))
lookup_flags |= LOOKUP_FOLLOW;
- lookup_flags |= LOOKUP_NO_EVAL;
-
retval = user_path_mountpoint_at(AT_FDCWD, name, lookup_flags, &path);
if (retval)
goto out;