imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-29 13:23:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

vsock/virtio: discard packets if the transport changes

Browse Source 
If the socket has been de-assigned or assigned to another transport,
we must discard any packets received because they are not expected
and would cause issues when we access vsk->transport.

A possible scenario is described by Hyunwoo Kim in the attached link,
where after a first connect() interrupted by a signal, and a second
connect() failed, we can find `vsk->transport` at NULL, leading to a
NULL pointer dereference.

Fixes: c0cfa2d8a7 ("vsock: add multi-transports support")
Cc: [email protected]
Reported-by: Hyunwoo Kim <[email protected]>
Reported-by: Wongi Lee <[email protected]>
Closes: https://lore.kernel.org/netdev/Z2LvdTTQR7dBmPb5@v4bel-B760M-AORUS-ELITE-AX/
Signed-off-by: Stefano Garzarella <[email protected]>
Reviewed-by: Hyunwoo Kim <[email protected]>
Signed-off-by: Paolo Abeni <[email protected]>
This commit is contained in:
Stefano Garzarella authored and Paolo Abeni committed 2025-01-14 12:29:36 +01:00
1 parent 0865b9fdb2
commit 2cb7c756f6
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
net/vmw_vsock/virtio_transport_common.c
+5 -2
View File
@@ -1628,8 +1628,11 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
lock_sock(sk);
/* Check if sk has been closed before lock_sock */
if (sock_flag(sk, SOCK_DONE)) {
/* Check if sk has been closed or assigned to another transport before
* lock_sock (note: listener sockets are not assigned to any transport)
*/
if (sock_flag(sk, SOCK_DONE) ||
(sk->sk_state != TCP_LISTEN && vsk->transport != &t->transport)) {
(void)virtio_transport_reset_no_sock(t, skb);
release_sock(sk);
sock_put(sk);