From: Raphael Norwitz <raphael.norwitz@nutanix.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
Raphael Norwitz <raphael.norwitz@nutanix.com>,
"mst@redhat.com" <mst@redhat.com>,
"qemu-trivial@nongnu.org" <qemu-trivial@nongnu.org>
Subject: Re: [PATCH] contrib/vhost-user-blk: Clean up deallocation of VuVirtqElement
Date: Fri, 1 Jul 2022 04:30:39 +0000 [thread overview]
Message-ID: <20220701043032.GA28338@raphael-debian-dev> (raw)
In-Reply-To: <20220630085219.1305519-1-armbru@redhat.com>
On Thu, Jun 30, 2022 at 10:52:19AM +0200, Markus Armbruster wrote:
> 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
NIT: if it
> it it could be, free() and g_free() do the right thing. Drop the
> conditional.
>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
> Fixes: Coverity CID 1490290
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> Not even compile-tested, because I can't figure out how this thing is
> supposed to be built. Its initial commit message says "make
> vhost-user-blk", but that doesn't work anymore.
>
make contrib/vhost-user-blk/vhost-user-blk works for me.
> contrib/vhost-user-blk/vhost-user-blk.c | 9 +++------
> 1 file 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 9cb78ca1d0..d6932a2645 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;
> }
> --
> 2.35.3
>
next prev parent reply other threads:[~2022-07-01 4:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 8:52 [PATCH] contrib/vhost-user-blk: Clean up deallocation of VuVirtqElement Markus Armbruster
2022-07-01 4:30 ` Raphael Norwitz [this message]
2022-07-01 5:40 ` Markus Armbruster
2022-07-26 14:57 ` Peter Maydell
2022-07-27 17:28 ` Raphael Norwitz
2022-07-28 9:51 ` Peter Maydell
2022-08-08 14:37 ` Alex Bennée
2022-07-25 18:07 ` Markus Armbruster
2022-07-26 14:46 ` Michael S. Tsirkin
2022-08-08 5:19 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220701043032.GA28338@raphael-debian-dev \
--to=raphael.norwitz@nutanix.com \
--cc=armbru@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.