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

Commit cda309de authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

vfs: move MAY_EXEC check from __lookup_hash() 



The only caller of __lookup_hash() that needs the exec permission check on
parent is lookup_one_len().

All lookup_hash() callers already checked permission in LOOKUP_PARENT walk.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3637c05d

fs/namei.c

+5 −6
Original line number Diff line number Diff line
@@ -1849,13 +1849,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, 
static struct dentry *__lookup_hash(struct qstr *name,

		struct dentry *base, struct nameidata *nd)

{

	struct inode *inode = base->d_inode;

	struct dentry *dentry;

	int err;



	err = inode_permission(inode, MAY_EXEC);

	if (err)

		return ERR_PTR(err);



	/*

	 * Don't bother with __d_lookup: callers are for creat as
@@ -1922,6 +1916,7 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) 
{

	struct qstr this;

	unsigned int c;

	int err;



	WARN_ON_ONCE(!mutex_is_locked(&base->d_inode->i_mutex));
@@ -1946,6 +1941,10 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) 
			return ERR_PTR(err);

	}



	err = inode_permission(base->d_inode, MAY_EXEC);

	if (err)

		return ERR_PTR(err);



	return __lookup_hash(&this, base, NULL);

}