Commit 558fe7c3 authored May 08, 2021 by Zhen Lei Committed by Greg Kroah-Hartman Jul 20, 2021

um: fix error return code in winch_tramp()



[ Upstream commit ccf1236ecac476d9d2704866d9a476c86e387971 ]

Fix to return a negative error code from the error handling case instead
of 0, as done elsewhere in this function.

Fixes: 89df6bfc ("uml: DEBUG_SHIRQ fixes")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Acked-By:  <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 57fc30d1

arch/um/drivers/chan_user.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -256,7 +256,8 @@ static int winch_tramp(int fd, struct tty_port port, int fd_out,
		goto out_close;
		}

		if (os_set_fd_block(*fd_out, 0)) {
		err = os_set_fd_block(*fd_out, 0);
		if (err) {
		printk(UM_KERN_ERR "winch_tramp: failed to set thread_fd "
		"non-blocking.\n");
		goto out_close;