Commit 74f1a299 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

Revert "fs: remove ksys_dup()" 



This reverts commit 8243186f ("fs: remove ksys_dup()") and the
subsequent fix for it in commit 2d3145f8 ("early init: fix error
handling when opening /dev/console").

Trying to use filp_open() and f_dupfd() instead of pseudo-syscalls
caused more trouble than what is worth it: it requires accessing vfs
internals and it turns out there were other bugs in it too.

In particular, the file reference counting was wrong - because unlike
the original "open+2*dup" sequence it used "filp_open+3*f_dupfd" and
thus had an extra leaked file reference.

That in turn then caused odd problems with Androidx86 long after boot
becaue of how the extra reference to the console kept the session active
even after all file descriptors had been closed.

Reported-by: default avataryouling 257 <youling257@gmail.com>
Cc: Arvind Sankar <nivedita@alum.mit.edu>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 738d2902

fs/file.c

+6 −1
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ SYSCALL_DEFINE2(dup2, unsigned int, oldfd, unsigned int, newfd) 
	return ksys_dup3(oldfd, newfd, 0);

}



SYSCALL_DEFINE1(dup, unsigned int, fildes)

int ksys_dup(unsigned int fildes)

{

	int ret = -EBADF;

	struct file *file = fget_raw(fildes);
@@ -975,6 +975,11 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes) 
	return ret;

}



SYSCALL_DEFINE1(dup, unsigned int, fildes)

{

	return ksys_dup(fildes);

}



int f_dupfd(unsigned int from, struct file *file, unsigned flags)

{

	int err;

include/linux/syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,7 @@ asmlinkage long sys_ni_syscall(void); 
 */



int ksys_umount(char __user *name, int flags);

int ksys_dup(unsigned int fildes);

int ksys_chroot(const char __user *filename);

ssize_t ksys_write(unsigned int fd, const char __user *buf, size_t count);

int ksys_chdir(const char __user *filename);

init/main.c

+6 −20
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
#include <linux/rodata_test.h>

#include <linux/jump_label.h>

#include <linux/mem_encrypt.h>

#include <linux/file.h>



#include <asm/io.h>

#include <asm/bugs.h>
@@ -1158,26 +1157,13 @@ static int __ref kernel_init(void *unused) 


void console_on_rootfs(void)

{

	struct file *file;

	unsigned int i;



	/* Open /dev/console in kernelspace, this should never fail */

	file = filp_open("/dev/console", O_RDWR, 0);

	if (IS_ERR(file))

		goto err_out;



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

	for (i = 0; i < 3; i++) {

		if (f_dupfd(i, file, 0) != i)

			goto err_out;

	}



	return;



err_out:

	/* no panic -- this might not be fatal */

	/* 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");

	return;



	/* create stdout/stderr */

	(void) ksys_dup(0);

	(void) ksys_dup(0);

}



static noinline void __init kernel_init_freeable(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE