Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39145f5f authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ff0ebee2

fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/namespace.c

+0 −2
Original line number Diff line number Diff line
@@ -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;