diff --git a/[refs] b/[refs] index 13ff9192f5d4..8dabb5e58187 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e75529e3c6c18dc535f38454173c4f2dfa99685 +refs/heads/master: 582aa64a04a579d47d05e4a0ee85bf047978ef4d diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 5f4cdf3ad913..e245d88b4d69 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1903,6 +1903,7 @@ static int path_init(int dfd, const char *name, unsigned int flags, get_fs_pwd(current->fs, &nd->path); } } else { + /* Caller must check execute permissions on the starting path component */ struct fd f = fdget_raw(dfd); struct dentry *dentry; @@ -1916,12 +1917,6 @@ static int path_init(int dfd, const char *name, unsigned int flags, fdput(f); return -ENOTDIR; } - - retval = inode_permission(dentry->d_inode, MAY_EXEC); - if (retval) { - fdput(f); - return retval; - } } nd->path = f.file->f_path;