vsock/virtio: update credit only if socket is not closed
authorStefano Garzarella <sgarzare@redhat.com>
Mon, 8 Feb 2021 14:44:54 +0000 (15:44 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 8 Feb 2021 21:27:46 +0000 (13:27 -0800)
If the socket is closed or is being released, some resources used by
virtio_transport_space_update() such as 'vsk->trans' may be released.

To avoid a use after free bug we should only update the available credit
when we are sure the socket is still open and we have the lock held.

Fixes: 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko")
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Link: https://lore.kernel.org/r/20210208144454.84438-1-sgarzare@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/vmw_vsock/virtio_transport_common.c

index 5956939eebb780ce1f1e17e1a15b2a85808f295c..e4370b1b7494760b1ea8fd806afd0c95d4acdadc 100644 (file)
@@ -1130,8 +1130,6 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
 
        vsk = vsock_sk(sk);
 
-       space_available = virtio_transport_space_update(sk, pkt);
-
        lock_sock(sk);
 
        /* Check if sk has been closed before lock_sock */
@@ -1142,6 +1140,8 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
                goto free_pkt;
        }
 
+       space_available = virtio_transport_space_update(sk, pkt);
+
        /* Update CID in case it has changed after a transport reset event */
        vsk->local_addr.svm_cid = dst.svm_cid;