diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index 5bc6f3d1dc8a..cf362dc9d1fd 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -2964,8 +2964,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, | |||
2964 | struct path path; | 2964 | struct path path; |
2965 | int error; | 2965 | int error; |
2966 | 2966 | ||
2967 | if (S_ISDIR(mode)) | 2967 | error = may_mknod(mode); |
2968 | return -EPERM; | 2968 | if (error) |
2969 | return error; | ||
2969 | 2970 | ||
2970 | dentry = user_path_create(dfd, filename, &path, 0); | 2971 | dentry = user_path_create(dfd, filename, &path, 0); |
2971 | if (IS_ERR(dentry)) | 2972 | if (IS_ERR(dentry)) |
@@ -2973,9 +2974,6 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, | |||
2973 | 2974 | ||
2974 | if (!IS_POSIXACL(path.dentry->d_inode)) | 2975 | if (!IS_POSIXACL(path.dentry->d_inode)) |
2975 | mode &= ~current_umask(); | 2976 | mode &= ~current_umask(); |
2976 | error = may_mknod(mode); | ||
2977 | if (error) | ||
2978 | goto out_dput; | ||
2979 | error = mnt_want_write(path.mnt); | 2977 | error = mnt_want_write(path.mnt); |
2980 | if (error) | 2978 | if (error) |
2981 | goto out_dput; | 2979 | goto out_dput; |