vhost-vsock: detach the virqueue element in case of error

Commit Message

Stefano Garzarella Feb. 28, 2022, 9:50 a.m. UTC

In vhost_vsock_common_send_transport_reset(), if an element popped from
the virtqueue is invalid, we should call virtqueue_detach_element() to
detach it from the virtqueue before freeing its memory.

Fixes: fc0b9b0e1c ("vhost-vsock: add virtio sockets device")
Cc: [e-mail]
Reported-by: VictorV <[e-mail]>
Signed-off-by: Stefano Garzarella <[e-mail]>
---
 hw/virtio/vhost-vsock-common.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Stefan Hajnoczi March 1, 2022, 9:30 a.m. UTC | #1

On Mon, Feb 28, 2022 at 10:50:58AM +0100, Stefano Garzarella wrote:
> In vhost_vsock_common_send_transport_reset(), if an element popped from
> the virtqueue is invalid, we should call virtqueue_detach_element() to
> detach it from the virtqueue before freeing its memory.
> 
> Fixes: fc0b9b0e1c ("vhost-vsock: add virtio sockets device")
> Cc: [e-mail]
> Reported-by: VictorV <[e-mail]>
> Signed-off-by: Stefano Garzarella <[e-mail]>
> ---
>  hw/virtio/vhost-vsock-common.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)

Reviewed-by: Stefan Hajnoczi <[e-mail]>

Patch

diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c
index 3f3771274e..ed706681ac 100644
--- a/hw/virtio/vhost-vsock-common.c
+++ b/hw/virtio/vhost-vsock-common.c
@@ -153,19 +153,23 @@  static void vhost_vsock_common_send_transport_reset(VHostVSockCommon *vvc)
     if (elem->out_num) {
         error_report("invalid vhost-vsock event virtqueue element with "
                      "out buffers");
-        goto out;
+        goto err;
     }
 
     if (iov_from_buf(elem->in_sg, elem->in_num, 0,
                      &event, sizeof(event)) != sizeof(event)) {
         error_report("vhost-vsock event virtqueue element is too short");
-        goto out;
+        goto err;
     }
 
     virtqueue_push(vq, elem, sizeof(event));
     virtio_notify(VIRTIO_DEVICE(vvc), vq);
 
-out:
+    g_free(elem);
+    return;
+
+err:
+    virtqueue_detach_element(vq, elem, 0);
     g_free(elem);
 }