Commit 2d3145f8 authored Dec 17, 2019 by Linus Torvalds

early init: fix error handling when opening /dev/console



The comment says "this should never fail", but it definitely can fail
when you have odd initial boot filesystems, or kernel configurations.

So get the error handling right: filp_open() returns an error pointer.

Reported-by: Jesse Barnes <jsbarnes@google.com>
Reported-by: youling 257 <youling257@gmail.com>
Fixes: 8243186f ("fs: remove ksys_dup()")
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 58d90a04

init/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1163,7 +1163,7 @@ void console_on_rootfs(void)

		/* Open /dev/console in kernelspace, this should never fail */
		file = filp_open("/dev/console", O_RDWR, 0);
		if (!file)
		if (IS_ERR(file))
		goto err_out;

		/* create stdin/stdout/stderr, this should never fail */

Admin message