FROMLIST: nsproxy: restore EINVAL for non-namespace file descriptor

The LTP testsuite reported a regression where users would now see EBADF
returned instead of EINVAL when an fd was passed that referred to an open
file but the file was not a nsfd. Fix this by continuing to report EINVAL.

Bug: 159609060
Link: https://lore.kernel.org/lkml/20200615085836.GR12456@shao2-debian
Fixes: 303cc571d1 ("nsproxy: attach to namespaces via pidfds")
Cc: Jan Stancek <jstancek@redhat.com>
Cc: Cyril Hrubis <chrubis@suse.cz>
Reported-by: kernel test robot <rong.a.chen@intel.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/lkml/20200616225612.4068799-1-christian.brauner@ubuntu.com/
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I659d41efb883f641b8db06f2c3b1f0dae8bab064
This commit is contained in:
Christian Brauner 2020-06-17 00:56:11 +02:00 committed by Greg Kroah-Hartman
parent 96331e0dc4
commit 6663a9e9de

View File

@ -531,7 +531,7 @@ SYSCALL_DEFINE2(setns, int, fd, int, flags)
} else if (!IS_ERR(pidfd_pid(file))) {
err = check_setns_flags(flags);
} else {
err = -EBADF;
err = -EINVAL;
}
if (err)
goto out;