lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 386/421] um: fix error return code in winch_tramp()
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ 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: 89df6bfc0405 ("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>
    ---
    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 9cffbbb15c56..669124d5290b 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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 19:11    [W:4.250 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site