Skip to content

Commit 0b3993b

Browse files
author
CKI Backport Bot
committed
vsock/virtio: discard packets if the transport changes
JIRA: https://issues.redhat.com/browse/RHEL-77228 CVE: CVE-2025-21669 commit 2cb7c75 Author: Stefano Garzarella <sgarzare@redhat.com> Date: Fri Jan 10 09:35:07 2025 +0100 vsock/virtio: discard packets if the transport changes 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: c0cfa2d ("vsock: add multi-transports support") Cc: stable@vger.kernel.org Reported-by: Hyunwoo Kim <v4bel@theori.io> Reported-by: Wongi Lee <qwerty@theori.io> Closes: https://lore.kernel.org/netdev/Z2LvdTTQR7dBmPb5@v4bel-B760M-AORUS-ELITE-AX/ Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> Reviewed-by: Hyunwoo Kim <v4bel@theori.io> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com>
1 parent e7bc4c4 commit 0b3993b

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

net/vmw_vsock/virtio_transport_common.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,8 +1576,11 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
15761576

15771577
lock_sock(sk);
15781578

1579-
/* Check if sk has been closed before lock_sock */
1580-
if (sock_flag(sk, SOCK_DONE)) {
1579+
/* Check if sk has been closed or assigned to another transport before
1580+
* lock_sock (note: listener sockets are not assigned to any transport)
1581+
*/
1582+
if (sock_flag(sk, SOCK_DONE) ||
1583+
(sk->sk_state != TCP_LISTEN && vsk->transport != &t->transport)) {
15811584
(void)virtio_transport_reset_no_sock(t, skb);
15821585
release_sock(sk);
15831586
sock_put(sk);

0 commit comments

Comments
 (0)