Re: [PATCH 1/1] um: fix error return code in winch_tramp()

Anton Ivanov
2021-05-08T09:13:47Z

On 08/05/2021 04:22, Zhen Lei wrote:
> Fix to return a negative error code from the error handling case instead
> of 0, as done elsewhere in this function.
>
> Fixes: 89df6bfc0405 ("uml: DEBUG_SHIRQ fixes")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
> arch/um/drivers/chan_user.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
> index d8845d4aac6a..6040817c036f 100644
> --- a/arch/um/drivers/chan_user.c
> +++ b/arch/um/drivers/chan_user.c
> @@ -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;
>
Acked-By: anton.ivanov@cambridgegreys.com

--
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661