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 <[email protected]> Reported-by: youling 257 <[email protected]> Fixes: 8243186 ("fs: remove ksys_dup()") Cc: Dominik Brodowski <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
jbg · Dec 17, 2019 · 2d3145f · 2d3145f
1 parent 58d90a0
commit 2d3145f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/init/main.c b/init/main.c
@@ -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 */