22b3f26e04
- Include upstream patches targeted for the next stable release (bug fixes only) block-Avoid-memleak-on-qcow2-image-info-.patch block-bdrv_set_backing_bs-fix-use-after-.patch hmp-vnc-Fix-info-vnc-list-leak.patch migration-colo-fix-use-after-free-of-loc.patch migration-ram-fix-use-after-free-of-loca.patch ppc-ppc405_boards-Remove-unnecessary-NUL.patch qcow2-List-autoclear-bit-names-in-header.patch scsi-qemu-pr-helper-Fix-out-of-bounds-ac.patch sheepdog-Consistently-set-bdrv_has_zero_.patch OBS-URL: https://build.opensuse.org/request/show/788690 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=541
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
Date: Mon, 23 Mar 2020 12:08:22 +0000
|
|
Subject: hmp/vnc: Fix info vnc list leak
|
|
|
|
Git-commit: d4ff109373ce871928c7e9ef648973eba642b484
|
|
|
|
We're iterating the list, and then freeing the iteration pointer rather
|
|
than the list head.
|
|
|
|
Fixes: 0a9667ecdb6d ("hmp: Update info vnc")
|
|
Reported-by: Coverity (CID 1421932)
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Message-Id: <20200323120822.51266-1-dgilbert@redhat.com>
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
monitor/hmp-cmds.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
|
|
index b2551c16d129291068ce64b5f1fd..2fdc84ec995449b5139a89575e18 100644
|
|
--- a/monitor/hmp-cmds.c
|
|
+++ b/monitor/hmp-cmds.c
|
|
@@ -729,10 +729,11 @@ static void hmp_info_vnc_servers(Monitor *mon, VncServerInfo2List *server)
|
|
|
|
void hmp_info_vnc(Monitor *mon, const QDict *qdict)
|
|
{
|
|
- VncInfo2List *info2l;
|
|
+ VncInfo2List *info2l, *info2l_head;
|
|
Error *err = NULL;
|
|
|
|
info2l = qmp_query_vnc_servers(&err);
|
|
+ info2l_head = info2l;
|
|
if (err) {
|
|
hmp_handle_error(mon, &err);
|
|
return;
|
|
@@ -761,7 +762,7 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict)
|
|
info2l = info2l->next;
|
|
}
|
|
|
|
- qapi_free_VncInfo2List(info2l);
|
|
+ qapi_free_VncInfo2List(info2l_head);
|
|
|
|
}
|
|
#endif
|