diff options
| author |   Stefan Hajnoczi <stefanha@redhat.com> | 2018-01-26 11:48:25 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-01-26 11:16:27 -0500 |
| commit | ba3169fc7548759be986b168d662e0ba64c2fd88 (patch) | |
| tree | 582b734fdf0dd5098a5cd57021e69e484595328f /net/vmw_vsock | |
| parent | dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state (diff) | |
| download | linux-dev-ba3169fc7548759be986b168d662e0ba64c2fd88.tar.xz linux-dev-ba3169fc7548759be986b168d662e0ba64c2fd88.zip | |
VSOCK: set POLLOUT | POLLWRNORM for TCP_CLOSING
select(2) with wfds but no rfds must return when the socket is shut down
by the peer. This way userspace notices socket activity and gets -EPIPE
from the next write(2).
Currently select(2) does not return for virtio-vsock when a SEND+RCV
shutdown packet is received. This is because vsock_poll() only sets
POLLOUT | POLLWRNORM for TCP_CLOSE, not the TCP_CLOSING state that the
socket is in when the shutdown is received.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 5d28abf87fbf..c9473d698525 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -951,7 +951,7 @@ static unsigned int vsock_poll(struct file *file, struct socket *sock, * POLLOUT|POLLWRNORM when peer is closed and nothing to read, * but local send is not shutdown. */ - if (sk->sk_state == TCP_CLOSE) { + if (sk->sk_state == TCP_CLOSE || sk->sk_state == TCP_CLOSING) { if (!(sk->sk_shutdown & SEND_SHUTDOWN)) mask |= POLLOUT | POLLWRNORM; |