Skip to content

Commit 18ad0af

Browse files
stefano-garzarellaopsiff
authored andcommitted
vsock/virtio: discard packets if the transport changes
commit 2cb7c75 upstream. 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 47bc95a3e0b178bc7ab8e1807fe816e2f4476eee)
1 parent 9e2f359 commit 18ad0af

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

net/vmw_vsock/virtio_transport_common.c

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

14291429
lock_sock(sk);
14301430

1431-
/* Check if sk has been closed before lock_sock */
1432-
if (sock_flag(sk, SOCK_DONE)) {
1431+
/* Check if sk has been closed or assigned to another transport before
1432+
* lock_sock (note: listener sockets are not assigned to any transport)
1433+
*/
1434+
if (sock_flag(sk, SOCK_DONE) ||
1435+
(sk->sk_state != TCP_LISTEN && vsk->transport != &t->transport)) {
14331436
(void)virtio_transport_reset_no_sock(t, skb);
14341437
release_sock(sk);
14351438
sock_put(sk);

0 commit comments

Comments
 (0)