netdev - RE: [PATCH net] vsock: fix timeout in vsock

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 27 May 2020 08:44:36 +0000
From:   Jorgen Hansen <jhansen@...are.com>
To:     'Stefano Garzarella' <sgarzare@...hat.com>,
        "davem@...emloft.net" <davem@...emloft.net>
CC:     George Zhang <georgezhang@...are.com>,
        Andy King <acking@...are.com>,
        Dexuan Cui <decui@...rosoft.com>,
        Dmitry Torokhov <dtor@...are.com>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        Stefan Hajnoczi <stefanha@...hat.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Jakub Kicinski <kuba@...nel.org>
Subject: RE: [PATCH net] vsock: fix timeout in vsock_accept()

> From: Stefano Garzarella <sgarzare@...hat.com>
> Sent: Wednesday, May 27, 2020 9:57 AM
> 
> 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@...hat.com>
> ---
>  net/vmw_vsock/af_vsock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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 &&
> --
> 2.25.4

Thanks for fixing this!

Reviewed-by: Jorgen Hansen <jhansen@...are.com>