aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2022-06-30 10:52:19 +0200
committerLaurent Vivier <laurent@vivier.eu>2022-08-08 07:19:26 +0200
commita32086de4919b9affb2ab2d0112d400eaf89f607 (patch)
tree568c1d3c5aaf4192229518e840d715666068b977 /contrib
parentc669f22f1a47897e8d1d595d6b8a59a572f9158c (diff)
downloadqemu-a32086de4919b9affb2ab2d0112d400eaf89f607.zip
qemu-a32086de4919b9affb2ab2d0112d400eaf89f607.tar.gz
qemu-a32086de4919b9affb2ab2d0112d400eaf89f607.tar.bz2
contrib/vhost-user-blk: Clean up deallocation of VuVirtqElement
We allocate VuVirtqElement with g_malloc() in virtqueue_alloc_element(), but free it with free() in vhost-user-blk.c. Harmless, but use g_free() anyway. One of the calls is guarded by a "not null" condition. Useless, because it cannot be null (it's dereferenced right before), and even it it could be, free() and g_free() do the right thing. Drop the conditional. Fixes: Coverity CID 1490290 Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Message-Id: <20220630085219.1305519-1-armbru@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/vhost-user-blk/vhost-user-blk.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index 9cb78ca..d6932a2 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -106,10 +106,7 @@ static void vub_req_complete(VubReq *req)
req->size + 1);
vu_queue_notify(vu_dev, req->vq);
- if (req->elem) {
- free(req->elem);
- }
-
+ g_free(req->elem);
g_free(req);
}
@@ -243,7 +240,7 @@ static int vub_virtio_process_req(VubDev *vdev_blk,
/* refer to hw/block/virtio_blk.c */
if (elem->out_num < 1 || elem->in_num < 1) {
fprintf(stderr, "virtio-blk request missing headers\n");
- free(elem);
+ g_free(elem);
return -1;
}
@@ -325,7 +322,7 @@ static int vub_virtio_process_req(VubDev *vdev_blk,
return 0;
err:
- free(elem);
+ g_free(elem);
g_free(req);
return -1;
}