vsock: use sock_error() to consume sk_err after a
Subsystems (4)
PATCH v2 1/1 vsock: use sock_error() to consume sk_err after a
From: Nguyen Dinh Phi <[email protected]>
Syzbot report an issue which can be reproduced with these steps:
r0 = socket(AF_VSOCK, SOCK_STREAM, 0)
bind(r0, {VMADDR_CID_ANY, PORT})
connect(r0, {VMADDR_CID_LOCAL, PORT})
listen(r0, backlog)
r1 = socket(AF_VSOCK, SOCK_STREAM, 0)
connect(r1, {VMADDR_CID_LOCAL, PORT})
connect(r0 -> self) -> -1, EPROTO
listen(r0) -> 0 connect(r1 -> r0) -> 0 accept(r0) -> -1, EPROTO
Basically, it creates a socket (r0) and triggers a self-connect after binding it. This self-connect fails with EPROTO because it loops back to r0 while the socket is still in the TCP_SYN_SENT state, causing it to be incorrectly dispatched to the connecting-client path. The unexpected packet type encountered there sets sk_err to EPROTO.
After that, it invokes a listen() call on the same socket. This listen() call succeeds because the kernel's listening path never inspects or clears sk_err. Then, a new socket (r1) is created as a normal client and connects to r0. However, vsock_accept() rejects this incoming connection because the listener's sk_err still holds the EPROTO error from the earlier failed self-connect.
This rejection causes the child socket created for r1's connection to never be freed on virtio or hyperv transports; only the VMCI transport implements pending_work to revisit and clean up a rejected socket
Fix the issue by using sock_error() to read the sk_err to prevent the rejection branch from occurring in this scenario.
sock_error() atomically reads and clears sk_err, ensuring the error is consumed when vsock_connect() returns and cannot affect subsequent operations on the same socket. This matches the established pattern used by other protocol connect() implementations in the network stack like __inet_stream_connect(), tipc_wait_for_connect()...
---
V2: Add reproducer steps to commit message.
net/vmw_vsock/af_vsock.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
net/vmw_vsock/af_vsock.c +2 -5
@@ -1847,14 +1847,11 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr,prepare_to_wait (sk_sleep (sk), &wait,TASK_INTERRUPTIBLE ); } -if (sk->sk_err) { - err = -sk->sk_err; + err =sock_error (sk); +if (err) { sk->sk_state =TCP_CLOSE ; sock->state =SS_UNCONNECTED ; - }else { - err =0 ; } - out_wait:finish_wait (sk_sleep (sk), &wait); out:
Signature · 1 line
2.53.0
Quoted 42 lines · On 周一 2026-7-27 15:13, [email protected] wrote:
From: Nguyen Dinh Phi <[email protected]>
Syzbot report an issue which can be reproduced with these steps:
r0 = socket(AF_VSOCK, SOCK_STREAM, 0) bind(r0, {VMADDR_CID_ANY, PORT}) connect(r0, {VMADDR_CID_LOCAL, PORT}) listen(r0, backlog) r1 = socket(AF_VSOCK, SOCK_STREAM, 0) connect(r1, {VMADDR_CID_LOCAL, PORT}) connect(r0 -> self) -> -1, EPROTO listen(r0) -> 0 connect(r1 -> r0) -> 0 accept(r0) -> -1, EPROTOBasically, it creates a socket (r0) and triggers a self-connect after binding it. This self-connect fails with EPROTO because it loops back to r0 while the socket is still in the
TCP_SYN_SENTstate, causing it to be incorrectly dispatched to the connecting-client path. The unexpected packet type encountered there setssk_errto EPROTO.After that, it invokes a
listen()call on the same socket. Thislisten()call succeeds because the kernel's listening path never inspects or clearssk_err. Then, a new socket (r1) is created as a normal client and connects to r0. However,vsock_accept()rejects this incoming connection because the listener'ssk_errstill holds the EPROTO error from the earlier failed self-connect.This rejection causes the child socket created for r1's connection to never be freed on virtio or hyperv transports; only the VMCI transport implements
pending_workto revisit and clean up a rejected socketFix the issue by using
sock_error()to read thesk_errto prevent the rejection branch from occurring in this scenario.
sock_error()atomically reads and clearssk_err, ensuring the error is consumed whenvsock_connect()returns and cannot affect subsequent operations on the same socket. This matches the established pattern used by other protocolconnect()implementations in the network stack like__inet_stream_connect(),tipc_wait_for_connect()...
Quoted 4 lines
Reported-by [email protected]Fixes d021c344051af ("VSOCK: Introduce VM Sockets")Signed-off-by Nguyen Dinh Phi <[email protected]>
Thanks for your patch.
Quoted 27 lines
---
V2: Add reproducer steps to commit message.net/vmw_vsock/af_vsock.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)net/vmw_vsock/af_vsock.c +2
-5@@ -1847,14 +1847,11 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr,prepare_to_wait (sk_sleep (sk), &wait,TASK_INTERRUPTIBLE ); } -if (sk->sk_err) { - err = -sk->sk_err; + err =sock_error (sk); +if (err) { sk->sk_state =TCP_CLOSE ; sock->state =SS_UNCONNECTED ; - }else { - err =0 ; } - out_wait:finish_wait (sk_sleep (sk), &wait); out:
Stefano Garzarella
maintainerQuoted 45 lines · mawupeng
Quoted 42 lines · On 周一 2026-7-27 15:13, [email protected] wrote:
From: Nguyen Dinh Phi <[email protected]>
Syzbot report an issue which can be reproduced with these steps:
r0 = socket(AF_VSOCK, SOCK_STREAM, 0) bind(r0, {VMADDR_CID_ANY, PORT}) connect(r0, {VMADDR_CID_LOCAL, PORT}) listen(r0, backlog) r1 = socket(AF_VSOCK, SOCK_STREAM, 0) connect(r1, {VMADDR_CID_LOCAL, PORT}) connect(r0 -> self) -> -1, EPROTO listen(r0) -> 0 connect(r1 -> r0) -> 0 accept(r0) -> -1, EPROTOBasically, it creates a socket (r0) and triggers a self-connect after binding it. This self-connect fails with EPROTO because it loops back to r0 while the socket is still in the
TCP_SYN_SENTstate, causing it to be incorrectly dispatched to the connecting-client path. The unexpected packet type encountered there setssk_errto EPROTO.After that, it invokes a
listen()call on the same socket. Thislisten()call succeeds because the kernel's listening path never inspects or clearssk_err. Then, a new socket (r1) is created as a normal client and connects to r0. However,vsock_accept()rejects this incoming connection because the listener'ssk_errstill holds the EPROTO error from the earlier failed self-connect.This rejection causes the child socket created for r1's connection to never be freed on virtio or hyperv transports; only the VMCI transport implements
pending_workto revisit and clean up a rejected socketFix the issue by using
sock_error()to read thesk_errto prevent the rejection branch from occurring in this scenario.
sock_error()atomically reads and clearssk_err, ensuring the error is consumed whenvsock_connect()returns and cannot affect subsequent operations on the same socket. This matches the established pattern used by other protocolconnect()implementations in the network stack like__inet_stream_connect(),tipc_wait_for_connect()...
Quoted 8 lines
Quoted 4 lines
Reported-by [email protected]Fixes d021c344051af ("VSOCK: Introduce VM Sockets")Signed-off-by Nguyen Dinh Phi <[email protected]>Thanks for your patch.
Test-by Wupeng Ma <[email protected]>
Thanks for testing, just a note, the right tag should be Tested-by:
Anyway, @Phi can you bring this with the right tag to the v3 if the code will not change?
Thanks,
Stefano
Stefano Garzarella
maintainercommit title seems truncated, can you check?
Quoted 8 lines · On Mon, Jul 27, 2026 at 03:13:02PM +0800, [email protected] wrote:
From: Nguyen Dinh Phi <[email protected]>
Syzbot report an issue which can be reproduced with these steps:
r0 =socket(AF_VSOCK, SOCK_STREAM, 0)
bind(r0, {VMADDR_CID_ANY, PORT})
connect(r0, {VMADDR_CID_LOCAL, PORT})
listen(r0, backlog)
Quoted 7 lines
r1 =
socket(AF_VSOCK, SOCK_STREAM, 0)
connect(r1, {VMADDR_CID_LOCAL, PORT})
connect(r0 -> self)-> -1, EPROTOlisten(r0) -> 0 connect(r1 -> r0) -> 0 accept(r0) -> -1, EPROTO
I spent some time to understand this, what about changing in this way (or something similar):
r0 = socket(AF_VSOCK, SOCK_STREAM, 0)
bind(r0, {VMADDR_CID_ANY, PORT})
connect(r0, {VMADDR_CID_LOCAL, PORT}) -> -1, EPROTO (self-connect)
listen(r0, backlog) -> 0
r1 = socket(AF_VSOCK, SOCK_STREAM, 0)
connect(r1, {VMADDR_CID_LOCAL, PORT}) -> 0
accept(r0) -> -1, EPROTO (stale sk_err)Quoted 42 lines
Basically, it creates a socket (r0) and triggers a self-connect after binding it. This self-connect fails with EPROTO because it loops back to r0 while the socket is still in the
TCP_SYN_SENTstate, causing it to be incorrectly dispatched to the connecting-client path. The unexpected packet type encountered there setssk_errto EPROTO.After that, it invokes a
listen()call on the same socket. Thislisten()call succeeds because the kernel's listening path never inspects or clearssk_err. Then, a new socket (r1) is created as a normal client and connects to r0. However,vsock_accept()rejects this incoming connection because the listener'ssk_errstill holds the EPROTO error from the earlier failed self-connect.This rejection causes the child socket created for r1's connection to never be freed on virtio or hyperv transports; only the VMCI transport implements
pending_workto revisit and clean up a rejected socketFix the issue by using
sock_error()to read thesk_errto prevent the rejection branch from occurring in this scenario.
sock_error()atomically reads and clearssk_err, ensuring the error is consumed whenvsock_connect()returns and cannot affect subsequent operations on the same socket. This matches the established pattern used by other protocolconnect()implementations in the network stack like__inet_stream_connect(),tipc_wait_for_connect()...Reported-by [email protected]Fixes d021c344051af ("VSOCK: Introduce VM Sockets")Signed-off-by Nguyen Dinh Phi <[email protected]>---
V2: Add reproducer steps to commit message.
net/vmw_vsock/af_vsock.c| 7 ++-----1 file changed, 2 insertions(+), 5 deletions(-)net/vmw_vsock/af_vsock.c +0
-0
net/vmw_vsock/af_vsock.c static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr, · line 1850
Quoted 6 lines
net/vmw_vsock/af_vsock.c +1
-2@@ -1847,14 +1847,11 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *addr,prepare_to_wait (sk_sleep (sk), &wait,TASK_INTERRUPTIBLE ); } -if (sk->sk_err) { - err = -sk->sk_err; + err =sock_error (sk);
Should we do the same in other paths (e.g. send/recv) as well in a follwup patch or in a series?
The patch itself LGTM.
Thanks,
Stefano
Quoted 13 lines
net/vmw_vsock/af_vsock.c +1
-3+if (err) { sk->sk_state =TCP_CLOSE ; sock->state =SS_UNCONNECTED ; - }else { - err =0 ; } -
out_wait:finish_wait(sk_sleep(sk), &wait);out:
Signature · 1 line
2.53.0
Quoted 8 lines · Stefano Garzarella
Should we do the same in other paths (e.g. send/recv) as well in a follwup patch or in a series?
The patch itself LGTM.
Thanks,
Stefano
That is a good point. I'll look into it and send a follow-up patch if it makes sense.
Thanks,
Phi