summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-06-07 17:44:28 +0200
committerChristoph Hellwig <hch@lst.de>2020-07-31 08:16:00 +0200
commit8f740636d9049a3f9665a0ec87a00822ec1120b4 (patch)
treeb882c3795401b79acc3adf7bb7a329bb5dbe3b34 /init
parentbf6419e4d5440c6d414a320506c5488857a5b001 (diff)
init: open code setting up stdin/stdout/stderr
Don't rely on the implicit set_fs(KERNEL_DS) for ksys_open to work, but instead open a struct file for /dev/console and then install it as FD 0/1/2 manually. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index 0ead83e86b5a..db0621dfbb04 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1457,15 +1457,19 @@ static int __ref kernel_init(void *unused)
"See Linux Documentation/admin-guide/init.rst for guidance.");
}
+/* Open /dev/console, for stdin/stdout/stderr, this should never fail */
void console_on_rootfs(void)
{
- /* Open the /dev/console as stdin, this should never fail */
- if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
- pr_err("Warning: unable to open an initial console.\n");
+ struct file *file = filp_open("/dev/console", O_RDWR, 0);
- /* create stdout/stderr */
- (void) ksys_dup(0);
- (void) ksys_dup(0);
+ if (IS_ERR(file)) {
+ pr_err("Warning: unable to open an initial console.\n");
+ return;
+ }
+ get_file_rcu_many(file, 2);
+ fd_install(get_unused_fd_flags(0), file);
+ fd_install(get_unused_fd_flags(0), file);
+ fd_install(get_unused_fd_flags(0), file);
}
static noinline void __init kernel_init_freeable(void)