diff options
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c index 5f4cdf3ad913..e245d88b4d69 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1903,6 +1903,7 @@ static int path_init(int dfd, const char *name, unsigned int flags, | |||
1903 | get_fs_pwd(current->fs, &nd->path); | 1903 | get_fs_pwd(current->fs, &nd->path); |
1904 | } | 1904 | } |
1905 | } else { | 1905 | } else { |
1906 | /* Caller must check execute permissions on the starting path component */ | ||
1906 | struct fd f = fdget_raw(dfd); | 1907 | struct fd f = fdget_raw(dfd); |
1907 | struct dentry *dentry; | 1908 | struct dentry *dentry; |
1908 | 1909 | ||
@@ -1916,12 +1917,6 @@ static int path_init(int dfd, const char *name, unsigned int flags, | |||
1916 | fdput(f); | 1917 | fdput(f); |
1917 | return -ENOTDIR; | 1918 | return -ENOTDIR; |
1918 | } | 1919 | } |
1919 | |||
1920 | retval = inode_permission(dentry->d_inode, MAY_EXEC); | ||
1921 | if (retval) { | ||
1922 | fdput(f); | ||
1923 | return retval; | ||
1924 | } | ||
1925 | } | 1920 | } |
1926 | 1921 | ||
1927 | nd->path = f.file->f_path; | 1922 | nd->path = f.file->f_path; |