From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Alex Chen <alex.chen@huawei.com>,
Peter Maydell <peter.maydell@linaro.org>,
Raphael Norwitz <raphael.norwitz@nutanix.com>,
Euler Robot <euler.robot@huawei.com>
Subject: [PULL 01/66] vhost-user-scsi: Fix memleaks in vus_proc_req()
Date: Tue, 8 Dec 2020 14:33:37 -0500 [thread overview]
Message-ID: <20201208193307.646726-2-mst@redhat.com> (raw)
In-Reply-To: <20201208193307.646726-1-mst@redhat.com>
From: Alex Chen <alex.chen@huawei.com>
The 'elem' is allocated memory in vu_queue_pop(), and its memory should be
freed in all error branches after vu_queue_pop().
In addition, in order to free the 'elem' memory outside of while(1) loop, move
the definition of 'elem' to the beginning of vus_proc_req().
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <20201125013055.34147-1-alex.chen@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 0f9ba4b2a2..4639440a70 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -232,6 +232,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
VugDev *gdev;
VusDev *vdev_scsi;
VuVirtq *vq;
+ VuVirtqElement *elem = NULL;
assert(vu_dev);
@@ -248,7 +249,6 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
g_debug("Got kicked on vq[%d]@%p", idx, vq);
while (1) {
- VuVirtqElement *elem;
VirtIOSCSICmdReq *req;
VirtIOSCSICmdResp *rsp;
@@ -288,6 +288,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
free(elem);
}
+ free(elem);
}
static void vus_queue_set_started(VuDev *vu_dev, int idx, bool started)
--
MST
next prev parent reply other threads:[~2020-12-08 19:37 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 19:33 [PULL 00/66] pc,pci,virtio: fixes, cleanups Michael S. Tsirkin
2020-12-08 19:33 ` Michael S. Tsirkin [this message]
2020-12-08 19:33 ` [PULL 02/66] memory: Rename memory_region_notify_one to memory_region_notify_iommu_one Michael S. Tsirkin
2020-12-08 19:33 ` [PULL 03/66] memory: Add IOMMUTLBEvent Michael S. Tsirkin
2020-12-08 19:33 ` [PULL 04/66] memory: Add IOMMU_NOTIFIER_DEVIOTLB_UNMAP IOMMUTLBNotificationType Michael S. Tsirkin
2020-12-08 19:33 ` [PULL 05/66] intel_iommu: Skip page walking on device iotlb invalidations Michael S. Tsirkin
2020-12-08 19:33 ` [PULL 06/66] memory: Skip bad range assertion if notifier is DEVIOTLB_UNMAP type Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 07/66] virtio: reset device on bad guest index in virtio_load() Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 08/66] acpi/gpex: Extract two APIs from acpi_dsdt_add_pci Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 09/66] fw_cfg: Refactor extra pci roots addition Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 10/66] hw/arm/virt: Write extra pci roots into fw_cfg Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 11/66] acpi: Extract crs build form acpi_build.c Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 12/66] acpi/gpex: Build tables for pxb Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 13/66] acpi: Align the size to 128k Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 14/66] unit-test: The files changed Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 15/66] unit-test: Add testcase for pxb Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 16/66] unit-test: Add the binary file and clear diff.h Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 17/66] failover: fix indentantion Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 18/66] failover: Use always atomics for primary_should_be_hidden Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 19/66] failover: primary bus is only used once, and where it is set Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 20/66] failover: Remove unused parameter Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 21/66] failover: Remove external partially_hotplugged property Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 22/66] failover: qdev_device_add() returns err or dev set Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 23/66] failover: Rename bool to failover_primary_hidden Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 24/66] failover: g_strcmp0() knows how to handle NULL Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 25/66] failover: Remove primary_device_opts Michael S. Tsirkin
2020-12-08 19:34 ` [PULL 26/66] failover: remove standby_id variable Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 27/66] failover: Remove primary_device_dict Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 28/66] failover: Remove memory leak Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 29/66] failover: simplify virtio_net_find_primary() Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 30/66] failover: should_be_hidden() should take a bool Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 31/66] failover: Rename function to hide_device() Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 32/66] failover: virtio_net_connect_failover_devices() does nothing Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 33/66] failover: Rename to failover_find_primary_device() Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 34/66] failover: simplify qdev_device_add() failover case Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 35/66] failover: simplify qdev_device_add() Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 36/66] failover: make sure that id always exist Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 37/66] failover: remove failover_find_primary_device() error parameter Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 38/66] failover: split failover_find_primary_device_id() Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 39/66] failover: We don't need to cache primary_device_id anymore Michael S. Tsirkin
2020-12-08 19:35 ` [PULL 40/66] failover: Caller of this two functions already have primary_dev Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 41/66] failover: simplify failover_unplug_primary Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 42/66] failover: Remove primary_dev member Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 43/66] hw: add compat machines for 6.0 Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 44/66] libvhost-user: replace qemu/bswap.h with glibc endian.h Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 45/66] libvhost-user: replace qemu/memfd.h usage Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 46/66] libvhost-user: remove qemu/compiler.h usage Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 47/66] libvhost-user: drop qemu/osdep.h dependency Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 48/66] libvhost-user: make it a meson subproject Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 49/66] libvhost-user: check memfd API Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 50/66] libvhost-user: add a simple link test without glib Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 51/66] .gitlab-ci: add build-libvhost-user Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 52/66] contrib/vhost-user-blk: avoid g_return_val_if() input validation Michael S. Tsirkin
2020-12-08 19:36 ` [PULL 53/66] contrib/vhost-user-gpu: " Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 54/66] contrib/vhost-user-input: " Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 55/66] block/export: " Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 56/66] hw/i386/pc: add max combined fw size as machine configuration option Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 57/66] acpi: cpuhp: introduce 'firmware performs eject' status/control bits Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 58/66] x86: acpi: introduce AcpiPmInfo::smi_on_cpu_unplug Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 59/66] tests/acpi: allow expected files change Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 60/66] x86: acpi: let the firmware handle pending "CPU remove" events in SMM Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 61/66] tests/acpi: update expected files Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 62/66] x86: ich9: factor out "guest_cpu_hotplug_features" Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 63/66] x86: ich9: let firmware negotiate 'CPU hot-unplug with SMI' feature Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 64/66] pcie_aer: Fix help message of pcie_aer_inject_error command Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 65/66] hw/virtio-pci Added counter for pcie capabilities offsets Michael S. Tsirkin
2020-12-08 19:37 ` [PULL 66/66] hw/virtio-pci Added AER capability Michael S. Tsirkin
2020-12-08 19:53 ` [PULL 00/66] pc,pci,virtio: fixes, cleanups Philippe Mathieu-Daudé
2020-12-08 20:26 ` Michael S. Tsirkin
2020-12-09 14:37 ` Peter Maydell
2020-12-09 16:20 ` Peter Maydell
2020-12-09 18:05 ` Michael S. Tsirkin
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=20201208193307.646726-2-mst@redhat.com \
--to=mst@redhat.com \
--cc=alex.chen@huawei.com \
--cc=euler.robot@huawei.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).