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

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

path_init(): don't bother with checking MAY_EXEC for LOOKUP_ROOT 



we'll hit that check in link_path_walk() anyway.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 159b0956

fs/namei.c

+2 −8
Original line number Diff line number Diff line
@@ -2142,7 +2142,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) 


static const char *path_init(struct nameidata *nd, unsigned flags)

{

	int retval = 0;

	const char *s = nd->name->name;



	if (!*s)
@@ -2154,13 +2153,8 @@ static const char *path_init(struct nameidata *nd, unsigned flags) 
	if (flags & LOOKUP_ROOT) {

		struct dentry *root = nd->root.dentry;

		struct inode *inode = root->d_inode;

		if (*s) {

			if (!d_can_lookup(root))

		if (*s && unlikely(!d_can_lookup(root)))

			return ERR_PTR(-ENOTDIR);

			retval = inode_permission(inode, MAY_EXEC);

			if (retval)

				return ERR_PTR(retval);

		}

		nd->path = nd->root;

		nd->inode = inode;

		if (flags & LOOKUP_RCU) {