Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12197718 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

Fix F_DUPFD_CLOEXEC breakage 



Fix a braino in F_DUPFD_CLOEXEC; f_dupfd() expects flags for alloc_fd(),
get_unused_fd() etc and there clone-on-exec if O_CLOEXEC, not
FD_CLOEXEC.

Reported-by: default avatarRichard W.M. Jones <rjones@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f5a246ea

fs/fcntl.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, 
		err = f_dupfd(arg, filp, 0);

		break;

	case F_DUPFD_CLOEXEC:

		err = f_dupfd(arg, filp, FD_CLOEXEC);

		err = f_dupfd(arg, filp, O_CLOEXEC);

		break;

	case F_GETFD:

		err = get_close_on_exec(fd) ? FD_CLOEXEC : 0;