diff options
| author |   Stefano Garzarella <sgarzare@redhat.com> | 2020-05-27 09:56:55 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-27 11:20:23 -0700 |
| commit | 7e0afbdfd13d1e708fe96e31c46c4897101a6a43 (patch) | |
| tree | d12eae25ad2af4fca707d7c04b3730a5d7d70adf /net | |
| parent | nfp: flower: fix used time of merge flow statistics (diff) | |
| download | wireguard-linux-7e0afbdfd13d1e708fe96e31c46c4897101a6a43.tar.xz wireguard-linux-7e0afbdfd13d1e708fe96e31c46c4897101a6a43.zip | |
vsock: fix timeout in vsock_accept()
The accept(2) is an "input" socket interface, so we should use
SO_RCVTIMEO instead of SO_SNDTIMEO to set the timeout.
So this patch replace sock_sndtimeo() with sock_rcvtimeo() to
use the right timeout in the vsock_accept().
Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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 a5f28708e0e7..626bf9044418 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1408,7 +1408,7 @@ static int vsock_accept(struct socket *sock, struct socket *newsock, int flags, /* Wait for children sockets to appear; these are the new sockets * created upon connection establishment. */ - timeout = sock_sndtimeo(listener, flags & O_NONBLOCK); + timeout = sock_rcvtimeo(listener, flags & O_NONBLOCK); prepare_to_wait(sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); while ((connected = vsock_dequeue_accept(listener)) == NULL && |