Commit 910d2f16 authored Jun 09, 2020 by Kees Cook

pidfd: Replace open-coded receive_fd()

Replace the open-coded version of receive_fd() with a call to the
new helper.

Thanks to Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com> for
catching a missed fput() in an earlier version of this patch.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Sargun Dhillon <sargun@sargun.me>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Kees Cook <keescook@chromium.org>

parent deefa7f3

kernel/pid.c

+2 −13

Original line number	Diff line number	Diff line
		@@ -636,19 +636,8 @@ static int pidfd_getfd(struct pid *pid, int fd)
		if (IS_ERR(file))
		return PTR_ERR(file);

		ret = security_file_receive(file);
		if (ret) {
		ret = receive_fd(file, O_CLOEXEC);
		fput(file);
		return ret;
		}

		ret = get_unused_fd_flags(O_CLOEXEC);
		if (ret < 0) {
		fput(file);
		} else {
		__receive_sock(file);
		fd_install(ret, file);
		}

		return ret;
		}

Admin message