[libvirt] [PATCH] qemu: Fix memory leak in qemuDomainUpdateMemoryDeviceInfo
The @meminfo allocated in qemuMonitorGetMemoryDeviceInfo may be lost when exit monitor failed. Luckily we can free it according to rc. Signed-off-by: Yi Wang <wang.yi59@zte.com.cn> --- src/qemu/qemu_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c8dc748..c34ec5a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5767,8 +5767,11 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr driver, rc = qemuMonitorGetMemoryDeviceInfo(priv->mon, &meminfo); - if (qemuDomainObjExitMonitor(driver, vm) < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0) { + if (0 == rc) + virHashFree(meminfo); return -1; + } /* if qemu doesn't support the info request, just carry on */ if (rc == -2) -- 1.8.3.1
On 05/25/2017 04:20 AM, Yi Wang wrote:
The @meminfo allocated in qemuMonitorGetMemoryDeviceInfo may be lost when exit monitor failed. Luckily we can free it according to rc.
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn> --- src/qemu/qemu_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c8dc748..c34ec5a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5767,8 +5767,11 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr driver,
rc = qemuMonitorGetMemoryDeviceInfo(priv->mon, &meminfo);
- if (qemuDomainObjExitMonitor(driver, vm) < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0) { + if (0 == rc)
We don't use this style in libvirt. Moreover, there's no real need for the check as virHashFree() accepts NULL happily.
+ virHashFree(meminfo); return -1; + }
/* if qemu doesn't support the info request, just carry on */ if (rc == -2)
I've fixed that, ACKed and pushed. Michal
VGhhbmsgeW91IE1pY2hhbCANCg0KDQoNCg0KDQotLS0NCg0KQmVzdCB3aXNoZXMNCg0KWWkgV2Fu Zw0KDQoNCg0KDQoNCg0K5Y6f5aeL6YKu5Lu2DQoNCg0KDQrlj5Hku7bkurrvvJog77ycbXByaXZv em5AcmVkaGF0LmNvbe+8ng0K5pS25Lu25Lq677ya5rGq57+8MTAxMjk5NjMg77ycbGlidmlyLWxp c3RAcmVkaGF0LmNvbe+8ng0K5oqE6YCB5Lq677ya5YiY5bu65YabMTAwMzM0ODLlvpDnhpkwMDEy MTkzMQ0K5pelIOacnyDvvJoyMDE35bm0MDXmnIgyNOaXpSAyMzowMA0K5Li7IOmimCDvvJpSZTog W2xpYnZpcnRdIFtQQVRDSF0gcWVtdTogRml4IG1lbW9yeSBsZWFrIGlucWVtdURvbWFpblVwZGF0 ZU1lbW9yeURldmljZUluZm8NCg0KDQoNCg0KDQpPbiAwNS8yNS8yMDE3IDA0OjIwIEFNLCBZaSBX YW5nIHdyb3RlOg0K77yeIFRoZSBAbWVtaW5mbyBhbGxvY2F0ZWQgaW4gcWVtdU1vbml0b3JHZXRN ZW1vcnlEZXZpY2VJbmZvIG1heSBiZSBsb3N0IHdoZW4NCu+8niBleGl0IG1vbml0b3IgZmFpbGVk LiBMdWNraWx5IHdlIGNhbiBmcmVlIGl0IGFjY29yZGluZyB0byByYy4NCu+8niANCu+8niBTaWdu ZWQtb2ZmLWJ5OiBZaSBXYW5nIO+8nHdhbmcueWk1OUB6dGUuY29tLmNu77yeDQrvvJ4gLS0tDQrv vJ4gIHNyYy9xZW11L3FlbXVfZG9tYWluLmMgfCA1ICsrKystDQrvvJ4gIDEgZmlsZSBjaGFuZ2Vk LCA0IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkNCu+8niANCu+8niBkaWZmIC0tZ2l0IGEv c3JjL3FlbXUvcWVtdV9kb21haW4uYyBiL3NyYy9xZW11L3FlbXVfZG9tYWluLmMNCu+8niBpbmRl eCBjOGRjNzQ4Li5jMzRlYzVhIDEwMDY0NA0K77yeIC0tLSBhL3NyYy9xZW11L3FlbXVfZG9tYWlu LmMNCu+8niArKysgYi9zcmMvcWVtdS9xZW11X2RvbWFpbi5jDQrvvJ4gQEAgLTU3NjcsOCArNTc2 NywxMSBAQCBxZW11RG9tYWluVXBkYXRlTWVtb3J5RGV2aWNlSW5mbyh2aXJRRU1VRHJpdmVyUHRy IGRyaXZlciwNCu+8niAgDQrvvJ4gICAgICByYyA9IHFlbXVNb25pdG9yR2V0TWVtb3J5RGV2aWNl SW5mbyhwcml2Le+8nm1vbiwgJm1lbWluZm8pDQrvvJ4gIA0K77yeIC0gICAgaWYgKHFlbXVEb21h aW5PYmpFeGl0TW9uaXRvcihkcml2ZXIsIHZtKSDvvJwgMCkNCu+8niArICAgIGlmIChxZW11RG9t YWluT2JqRXhpdE1vbml0b3IoZHJpdmVyLCB2bSkg77ycIDApIHsNCu+8niArICAgICAgICBpZiAo MCA9PSByYykNCg0KV2UgZG9uJ3QgdXNlIHRoaXMgc3R5bGUgaW4gbGlidmlydC4gTW9yZW92ZXIs IHRoZXJlJ3Mgbm8gcmVhbCBuZWVkIGZvcg0KdGhlIGNoZWNrIGFzIHZpckhhc2hGcmVlKCkgYWNj ZXB0cyBOVUxMIGhhcHBpbHkuDQoNCu+8niArICAgICAgICAgICAgdmlySGFzaEZyZWUobWVtaW5m bykNCu+8niAgICAgICAgICByZXR1cm4gLTENCu+8niArICAgIH0NCu+8niAgDQrvvJ4gICAgICAv KiBpZiBxZW11IGRvZXNuJ3Qgc3VwcG9ydCB0aGUgaW5mbyByZXF1ZXN0LCBqdXN0IGNhcnJ5IG9u ICovDQrvvJ4gICAgICBpZiAocmMgPT0gLTIpDQrvvJ4gDQoNCkkndmUgZml4ZWQgdGhhdCwgQUNL ZWQgYW5kIHB1c2hlZC4NCg0KTWljaGFs
participants (3)
-
Michal Privoznik -
wang.yi59＠zte.com.cn -
Yi Wang