• Greg Kurz's avatar
    net/9p: avoid -ERESTARTSYS leak to userspace · a8522243
    Greg Kurz authored
    If it was interrupted by a signal, the 9p client may need to send some
    more requests to the server for cleanup before returning to userspace.
    
    To avoid such a last minute request to be interrupted right away, the
    client memorizes if a signal is pending, clears TIF_SIGPENDING, handles
    the request and calls recalc_sigpending() before returning.
    
    Unfortunately, if the transmission of this cleanup request fails for any
    reason, the transport returns an error and the client propagates it
    right away, without calling recalc_sigpending().
    
    This ends up with -ERESTARTSYS from the initially interrupted request
    crawling up to syscall exit, with TIF_SIGPENDING cleared by the cleanup
    request.  The specific signal handling code, which is responsible for
    converting -ERESTARTSYS to -EINTR is not called, and userspace receives
    the confusing errno value:
    
      open: Unknown error 512 (512)
    
    This is really hard to hit in real life.  I discovered the issue while
    working on hot-unplug of a virtio-9p-pci device with an instrumented
    QEMU allowing to control request completion.
    
    Both p9_client_zc_rpc() and p9_client_rpc() functions have this buggy
    error path actually.  Their code flow is a bit obscure and the best
    thing to do would probably be a full rewrite: to really ensure this
    situation of clearing TIF_SIGPENDING and returning -ERESTARTSYS can
    never happen.
    
    But given the general lack of interest for the 9p code, I won't risk
    breaking more things.  So this patch simply fixes the buggy paths in
    both functions with a trivial label+goto.
    
    Thanks to Laurent Dufour for his help and suggestions on how to find the
    root cause and how to fix it.
    
    Link: http://lkml.kernel.org/r/152062809886.10599.7361006774123053312.stgit@bahia.lanSigned-off-by: default avatarGreg Kurz <groug@kaod.org>
    Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Reviewed-by: default avatarYiwen Jiang <jiangyiwen@huawei.com>
    Cc: Eric Van Hensbergen <ericvh@gmail.com>
    Cc: Ron Minnich <rminnich@sandia.gov>
    Cc: Latchesar Ionkov <lucho@ionkov.net>
    Cc: David Miller <davem@davemloft.net>
    Cc: Laurent Dufour <ldufour@linux.vnet.ibm.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    a8522243
client.c 52.5 KB