|
 |
fbe740 |
From 388611da8330fb19693caf927680e9af08d5738e Mon Sep 17 00:00:00 2001
|
|
|
fbe740 |
Message-Id: <388611da8330fb19693caf927680e9af08d5738e@dist-git>
|
|
|
fbe740 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
Date: Wed, 19 Feb 2020 15:10:27 +0100
|
|
|
fbe740 |
Subject: [PATCH] qemuDomainGetStatsIOThread: Don't leak array with 0 iothreads
|
|
|
fbe740 |
MIME-Version: 1.0
|
|
|
fbe740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fbe740 |
Content-Transfer-Encoding: 8bit
|
|
|
fbe740 |
|
|
|
fbe740 |
qemuMonitorGetIOThreads returns a NULL-terminated list even when 0
|
|
|
fbe740 |
iothreads are present. The caller didn't perform cleanup if there were 0
|
|
|
fbe740 |
iothreads leaking the array.
|
|
|
fbe740 |
|
|
|
fbe740 |
https://bugzilla.redhat.com/show_bug.cgi?id=1804548
|
|
|
fbe740 |
|
|
|
fbe740 |
Fixes: d1eac92784573559b6fd56836e33b215c89308e3
|
|
|
fbe740 |
Reported-by: Jing Yan <jiyan@redhat.com>
|
|
|
fbe740 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
(cherry picked from commit 9bf9e0ae6af38c806f4672ca7b12a6b38d5a9581)
|
|
|
fbe740 |
Message-Id: <eef614566ad383a1393a295caa6e2550381eb3e7.1582120424.git.pkrempa@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
---
|
|
|
fbe740 |
src/qemu/qemu_driver.c | 8 ++++++--
|
|
|
fbe740 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
fbe740 |
index af81c4a6e4..69e4f7264b 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_driver.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_driver.c
|
|
|
fbe740 |
@@ -21532,8 +21532,12 @@ qemuDomainGetStatsIOThread(virQEMUDriverPtr driver,
|
|
|
fbe740 |
if ((niothreads = qemuDomainGetIOThreadsMon(driver, dom, &iothreads)) < 0)
|
|
|
fbe740 |
return -1;
|
|
|
fbe740 |
|
|
|
fbe740 |
- if (niothreads == 0)
|
|
|
fbe740 |
- return 0;
|
|
|
fbe740 |
+ /* qemuDomainGetIOThreadsMon returns a NULL-terminated list, so we must free
|
|
|
fbe740 |
+ * it even if it returns 0 */
|
|
|
fbe740 |
+ if (niothreads == 0) {
|
|
|
fbe740 |
+ ret = 0;
|
|
|
fbe740 |
+ goto cleanup;
|
|
|
fbe740 |
+ }
|
|
|
fbe740 |
|
|
|
fbe740 |
if (virTypedParamListAddUInt(params, niothreads, "iothread.count") < 0)
|
|
|
fbe740 |
goto cleanup;
|
|
|
fbe740 |
--
|
|
|
fbe740 |
2.25.0
|
|
|
fbe740 |
|