Commit f488443d authored by Al Viro's avatar Al Viro
Browse files

namei: take O_NOFOLLOW treatment into do_last()



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 34b128f3
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -3059,6 +3059,11 @@ 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;
	}

@@ -3243,12 +3248,6 @@ static struct file *path_openat(int dfd, struct filename *pathname,
	while (unlikely(error > 0)) { /* trailing symlink */
		struct path link = path;
		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);
		if (unlikely(error))
			break;