From: Al Viro <viro@zeniv.linux.org.uk>
To: Christoph Hellwig <hch@lst.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org
Subject: Re: [PATCH 23/24] init: add an init_mknod helper
Date: Tue, 21 Jul 2020 18:02:46 +0100 [thread overview]
Message-ID: <20200721170246.GW2786714@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20200721162818.197315-24-hch@lst.de>
On Tue, Jul 21, 2020 at 06:28:17PM +0200, Christoph Hellwig wrote:
> +int __init init_mknod(const char *filename, umode_t mode, unsigned int dev)
> +{
> + struct dentry *dentry;
> + struct path path;
> + int error;
> +
> + if (S_ISFIFO(mode) || S_ISSOCK(mode))
> + dev = 0;
> + else if (!(S_ISBLK(mode) || S_ISCHR(mode)))
> + return -EINVAL;
> +
> + dentry = user_path_create(AT_FDCWD, filename, &path, 0);
> + if (IS_ERR(dentry))
> + return PTR_ERR(dentry);
user_path_create() is wrong here.
> +
> + if (!IS_POSIXACL(path.dentry->d_inode))
> + mode &= ~current_umask();
> + error = security_path_mknod(&path, dentry, mode, dev);
> + if (!error)
> + error = vfs_mknod(path.dentry->d_inode, dentry, mode,
> + new_decode_dev(dev));
> + done_path_create(&path, dentry);
> + return error;
> +}
> +
> int __init init_link(const char *oldname, const char *newname)
> {
> struct dentry *new_dentry;
> diff --git a/init/initramfs.c b/init/initramfs.c
> index b1a0a1d5c3c135..bd685fdb5840f3 100644
> --- a/init/initramfs.c
> +++ b/init/initramfs.c
> @@ -359,7 +359,7 @@ static int __init do_name(void)
> } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
> S_ISFIFO(mode) || S_ISSOCK(mode)) {
> if (maybe_link() == 0) {
> - ksys_mknod(collected, mode, rdev);
> + init_mknod(collected, mode, rdev);
> init_chown(collected, uid, gid, AT_SYMLINK_NOFOLLOW);
> init_chmod(collected, mode);
> do_utime(collected, mtime);
> diff --git a/init/noinitramfs.c b/init/noinitramfs.c
> index b8bdba1c949cf9..490f2bd2b49979 100644
> --- a/init/noinitramfs.c
> +++ b/init/noinitramfs.c
> @@ -22,8 +22,7 @@ static int __init default_rootfs(void)
> if (err < 0)
> goto out;
>
> - err = ksys_mknod((const char __user __force *) "/dev/console",
> - S_IFCHR | S_IRUSR | S_IWUSR,
> + err = init_mknod("/dev/console", S_IFCHR | S_IRUSR | S_IWUSR,
> new_encode_dev(MKDEV(5, 1)));
> if (err < 0)
> goto out;
> --
> 2.27.0
>
next prev parent reply other threads:[~2020-07-21 17:03 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 16:27 add file system helpers that take kernel pointers for the init code v2 Christoph Hellwig
2020-07-21 16:27 ` [PATCH 01/24] fs: refactor do_mount Christoph Hellwig
2020-07-21 16:27 ` [PATCH 02/24] fs: refactor ksys_umount Christoph Hellwig
2020-07-21 16:27 ` [PATCH 03/24] fs: push the getname from do_rmdir into the callers Christoph Hellwig
2020-07-21 16:27 ` [PATCH 04/24] devtmpfs: open code do_mount Christoph Hellwig
2020-07-21 16:27 ` [PATCH 05/24] devtmpfs: open code ksys_chdir and ksys_chroot Christoph Hellwig
2020-07-21 16:49 ` Linus Torvalds
2020-07-21 17:16 ` Al Viro
2020-07-21 18:26 ` Christoph Hellwig
2020-07-21 16:28 ` [PATCH 06/24] md: open code vfs_stat in md_setup_drive Christoph Hellwig
2020-07-21 16:55 ` Al Viro
2020-07-21 18:27 ` Christoph Hellwig
2020-07-22 7:44 ` Al Viro
2020-07-22 14:05 ` Christoph Hellwig
2020-07-21 16:28 ` [PATCH 07/24] init: initialize ramdisk_execute_command at compile time Christoph Hellwig
2020-07-21 16:28 ` [PATCH 08/24] init: move the prepare_namespace prototype to init/do_mounts.h Christoph Hellwig
2020-07-21 16:28 ` [PATCH 09/24] init: mark create_dev as __init Christoph Hellwig
2020-07-21 16:28 ` [PATCH 10/24] init: open code ksys_umount in handle_initrd Christoph Hellwig
2020-07-21 16:28 ` [PATCH 11/24] init: open code do_utimes in do_utime Christoph Hellwig
2020-07-21 16:28 ` [PATCH 12/24] init: add an init_mount helper Christoph Hellwig
2020-07-21 16:58 ` Al Viro
2020-07-21 16:28 ` [PATCH 13/24] init: add an init_unlink helper Christoph Hellwig
2020-07-21 17:12 ` Al Viro
2020-07-21 16:28 ` [PATCH 14/24] init: add an init_rmdir helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 15/24] init: add an init_chdir helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 16/24] init: add an init_chroot helper Christoph Hellwig
2020-07-21 17:10 ` Al Viro
2020-07-21 16:28 ` [PATCH 17/24] init: add an init_chown helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 18/24] init: add an init_chmod helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 19/24] init: add an init_eaccess helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 20/24] init: add an init_link helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 21/24] init: add an init_symlink helper Christoph Hellwig
2020-07-21 17:00 ` Al Viro
2020-07-21 16:28 ` [PATCH 22/24] init: add an init_mkdir helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 23/24] init: add an init_mknod helper Christoph Hellwig
2020-07-21 17:02 ` Al Viro [this message]
2020-07-21 16:28 ` [PATCH 24/24] init: add an init_lstat helper Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200721170246.GW2786714@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).