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

Commit 8e4bfca1 authored by Al Viro's avatar Al Viro
Browse files

mknod: take sanity checks on mode into the very beginning 



Note that applying umask can't affect their results.  While
that affects errno in cases like
	mknod("/no_such_directory/a", 030000)
yielding -EINVAL (due to impossible mode_t) instead of
-ENOENT (due to inexistent directory), IMO that makes a lot
more sense, POSIX allows to return either and any software
that relies on getting -ENOENT instead of -EINVAL in that
case deserves everything it gets.

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

fs/namei.c

+3 −5
Original line number Diff line number Diff line
@@ -2964,8 +2964,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, 
	struct path path;

	int error;



	if (S_ISDIR(mode))

		return -EPERM;

	error = may_mknod(mode);

	if (error)

		return error;



	dentry = user_path_create(dfd, filename, &path, 0);

	if (IS_ERR(dentry))
@@ -2973,9 +2974,6 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, 


	if (!IS_POSIXACL(path.dentry->d_inode))

		mode &= ~current_umask();

	error = may_mknod(mode);

	if (error)

		goto out_dput;

	error = mnt_want_write(path.mnt);

	if (error)

		goto out_dput;