lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 435/717] um: tty: Fix handling of close in tty lines
    Date
    From: Anton Ivanov <anton.ivanov@cambridgegreys.com>

    [ Upstream commit 9b1c0c0e25dcccafd30e7d4c150c249cc65550eb ]

    Fix a logical error in tty reading. We get 0 and errno == EAGAIN
    on the first attempt to read from a closed file descriptor.

    Compared to that a true EAGAIN is EAGAIN and -1.

    If we check errno for EAGAIN first, before checking the return
    value we miss the fact that the descriptor is closed.

    This bug is as old as the driver. It was not showing up with
    the original POLL based IRQ controller, because it was
    producing multiple events. Switching to EPOLL unmasked it.

    Fixes: ff6a17989c08 ("Epoll based IRQ controller")
    Signed-off-by: Anton Ivanov <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 | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
    index 4d80526a4236e..d8845d4aac6a7 100644
    --- a/arch/um/drivers/chan_user.c
    +++ b/arch/um/drivers/chan_user.c
    @@ -26,10 +26,10 @@ int generic_read(int fd, char *c_out, void *unused)
    n = read(fd, c_out, sizeof(*c_out));
    if (n > 0)
    return n;
    - else if (errno == EAGAIN)
    - return 0;
    else if (n == 0)
    return -EIO;
    + else if (errno == EAGAIN)
    + return 0;
    return -errno;
    }

    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:2.137 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site