diff options
| author | Stefano Garzarella <sgarzare@redhat.com> | 2021-02-08 15:44:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-17 10:35:19 +0100 |
| commit | c025081b57df63f5a0b92ab57855904108c059d7 (patch) | |
| tree | c7ec23c1a1023efaa51a234facb5dca8c3c20cda | |
| parent | 2545c5bd8316c7e3ba29312eb3dce431530ecce8 (diff) | |
| download | linux-stable-c025081b57df63f5a0b92ab57855904108c059d7.tar.gz linux-stable-c025081b57df63f5a0b92ab57855904108c059d7.tar.bz2 linux-stable-c025081b57df63f5a0b92ab57855904108c059d7.zip | |
vsock/virtio: update credit only if socket is not closed
commit ce7536bc7398e2ae552d2fabb7e0e371a9f1fe46 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/vmw_vsock/virtio_transport_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index efbb521bff13..dde16a033a09 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1100,10 +1100,10 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, vsk = vsock_sk(sk); - space_available = virtio_transport_space_update(sk, pkt); - lock_sock(sk); + 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; |