|
 |
51d9a2 |
From d39f6ba78035adbe3772603a1939af1e67464448 Mon Sep 17 00:00:00 2001
|
|
|
51d9a2 |
Message-Id: <d39f6ba78035adbe3772603a1939af1e67464448@dist-git>
|
|
|
51d9a2 |
From: Luyao Huang <lhuang@redhat.com>
|
|
|
51d9a2 |
Date: Wed, 11 Jul 2018 17:29:48 +0200
|
|
|
51d9a2 |
Subject: [PATCH] virDomainConfNWFilterInstantiate: initialize @xml to avoid
|
|
|
51d9a2 |
random crash
|
|
|
51d9a2 |
MIME-Version: 1.0
|
|
|
51d9a2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
51d9a2 |
Content-Transfer-Encoding: 8bit
|
|
|
51d9a2 |
|
|
|
51d9a2 |
https://bugzilla.redhat.com/show_bug.cgi?id=1599545
|
|
|
51d9a2 |
|
|
|
51d9a2 |
If the code jump to the cleanup before assigning value to @xml
|
|
|
51d9a2 |
libvirtd may crash when it tries to free an uninitialized pointer.
|
|
|
51d9a2 |
|
|
|
51d9a2 |
backtrace:
|
|
|
51d9a2 |
|
|
|
51d9a2 |
0 0x00007ffff428d59c in free () from /lib64/libc.so.6
|
|
|
51d9a2 |
1 0x00007ffff721314a in virFree (ptrptr=ptrptr@entry=0x7fffc67f1b00) at util/viralloc.c:582
|
|
|
51d9a2 |
2 0x00007ffff7345ac4 in virDomainConfNWFilterInstantiate (vmname=<optimized out>,
|
|
|
51d9a2 |
vmuuid=vmuuid@entry=0x7fffc0181ca8 "߉\237\\۔H\262\206z\340\302f\265\233z", net=<optimized out>,
|
|
|
51d9a2 |
ignoreExists=ignoreExists@entry=true) at conf/domain_nwfilter.c:122
|
|
|
51d9a2 |
3 0x00007fffca5a77f6 in qemuProcessFiltersInstantiate (ignoreExists=true, def=0x7fffc0181ca0) at qemu/qemu_process.c:3028
|
|
|
51d9a2 |
4 qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:7653
|
|
|
51d9a2 |
5 0x00007ffff72c4895 in virThreadHelper (data=<optimized out>) at util/virthread.c:206
|
|
|
51d9a2 |
6 0x00007ffff45dcdd5 in start_thread () from /lib64/libpthread.so.0
|
|
|
51d9a2 |
7 0x00007ffff4305ead in clone () from /lib64/libc.so.6
|
|
|
51d9a2 |
|
|
|
51d9a2 |
Signed-off-by: Luyao Huang <lhuang@redhat.com>
|
|
|
51d9a2 |
(cherry picked from commit d7557f5f6f51264c1b5623e97f7b4d5259d4d3b6)
|
|
|
51d9a2 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
51d9a2 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
51d9a2 |
---
|
|
|
51d9a2 |
src/conf/domain_nwfilter.c | 2 +-
|
|
|
51d9a2 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
51d9a2 |
|
|
|
51d9a2 |
diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
|
|
|
51d9a2 |
index 948b32481e..24b5f42ddd 100644
|
|
|
51d9a2 |
--- a/src/conf/domain_nwfilter.c
|
|
|
51d9a2 |
+++ b/src/conf/domain_nwfilter.c
|
|
|
51d9a2 |
@@ -90,7 +90,7 @@ virDomainConfNWFilterInstantiate(const char *vmname,
|
|
|
51d9a2 |
virConnectPtr conn = virGetConnectNWFilter();
|
|
|
51d9a2 |
virNWFilterBindingDefPtr def = NULL;
|
|
|
51d9a2 |
virNWFilterBindingPtr binding = NULL;
|
|
|
51d9a2 |
- char *xml;
|
|
|
51d9a2 |
+ char *xml = NULL;
|
|
|
51d9a2 |
int ret = -1;
|
|
|
51d9a2 |
|
|
|
51d9a2 |
VIR_DEBUG("vmname=%s portdev=%s filter=%s ignoreExists=%d",
|
|
|
51d9a2 |
--
|
|
|
51d9a2 |
2.18.0
|
|
|
51d9a2 |
|