1f0277483b
- block: bugfix: Don't pause vm when NOSPACE EIO happened - block: enable cache mode of empty cdrom - block/mirror: fix file-system went to read-only after block-mirror - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - scsi-bus: fix unmatched object_unref() - block: Add sanity check when setting retry parameters - block-backend: Stop retrying when draining - scsi-disk: Add support for retry on errors - scsi-bus: Refactor the code that retries requests - virtio_blk: Add support for retry on errors - block: Add error retry param setting - block-backend: Add timeout support for retry - block-backend: Enable retry action on errors - block-backend: Add device specific retry callback - block-backend: Introduce retry timer - qapi/block-core: Add retry option for error action - scsi: bugfix: fix division by zero - scsi: cdrom: Fix crash after remote cdrom detached - qemu-pr: fixed ioctl failed for multipath disk - scsi-disk: define props in scsi_block_disk to avoid memleaks - bugfix: fix possible memory leak - bugfix: fix some illegal memory access and memory leak - util/log: add CONFIG_DISABLE_QEMU_LOG macro - log: Add some logs on VM runtime path - bugfix: fix eventfds may double free when vm_id reused in ivshmem - hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() - hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() - qemu-img create: 'cache' paramter only use for reg file image - qemu-img: add qemu-img direct create - qemu-img block: set zero flags only when discard_zeros of the block supported - Revert "file-posix: Remove unused s->discard_zeroes" - pcie_sriov: Validate NumVFs (CVE-2024-26327) - hw/nvme: Use pcie_sriov_num_vfs() (CVE-2024-26328) - hw/acpi/cpu: Use CPUState typedef - target/i386/sev: Fix missing ERRP_GUARD() for error_prepend() - virtio-gpu: remove needless condition - hw/i2c/smbus_slave: Add object path on error prints - vfio/pci: Ascend710 change to bar2 quirk - vfio/pci: Ascend910 need 4Bytes quirk in bar0 - vfio/pci: Ascend710 need 4Bytes quirk in bar0 - vfio/pci: Ascend310 need 4Bytes quirk in bar4 - chardev/char-socket: Fix TLS io channels sending too much data to the backend - i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - blkio: Respect memory-alignment for bounce buffer allocations - virtio-gpu: Correct virgl_renderer_resource_get_info() error check - hw/usb: Style cleanup - tests/qemu-iotests: resolved the problem that the 108 test cases in the container fail Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 404d45bf9147058a475a8031c454a6c8e0acc123)
99 lines
3.1 KiB
Diff
99 lines
3.1 KiB
Diff
From e6a20580801314e9d47682d7b8d8161c030eab04 Mon Sep 17 00:00:00 2001
|
|
From: jiangdongxu <jiangdongxu1@huawei.com>
|
|
Date: Thu, 10 Feb 2022 22:12:50 +0800
|
|
Subject: [PATCH] bugfix: fix possible memory leak
|
|
|
|
Signed-off-by: caojinhua <caojinhua1@huawei.com>
|
|
Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
|
|
Signed-off-by: Adttil <yangtao286@huawei.com>
|
|
---
|
|
migration/savevm.c | 2 ++
|
|
qga/main.c | 18 +++++++++++++-----
|
|
2 files changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/migration/savevm.c b/migration/savevm.c
|
|
index eec5503a42..477a19719f 100644
|
|
--- a/migration/savevm.c
|
|
+++ b/migration/savevm.c
|
|
@@ -1553,6 +1553,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
|
|
ret = vmstate_save(f, se, vmdesc);
|
|
if (ret) {
|
|
qemu_file_set_error(f, ret);
|
|
+ json_writer_free(vmdesc);
|
|
return ret;
|
|
}
|
|
|
|
@@ -1572,6 +1573,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
|
|
migrate_set_error(ms, local_err);
|
|
error_report_err(local_err);
|
|
qemu_file_set_error(f, ret);
|
|
+ json_writer_free(vmdesc);
|
|
return ret;
|
|
}
|
|
}
|
|
diff --git a/qga/main.c b/qga/main.c
|
|
index 8668b9f3d3..c4dcbb86be 100644
|
|
--- a/qga/main.c
|
|
+++ b/qga/main.c
|
|
@@ -1399,7 +1399,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
if (g_mkdir_with_parents(config->state_dir, S_IRWXU) == -1) {
|
|
g_critical("unable to create (an ancestor of) the state directory"
|
|
" '%s': %s", config->state_dir, strerror(errno));
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
#endif
|
|
|
|
@@ -1424,7 +1424,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
if (!log_file) {
|
|
g_critical("unable to open specified log file: %s",
|
|
strerror(errno));
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
s->log_file = log_file;
|
|
}
|
|
@@ -1435,7 +1435,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
s->pstate_filepath,
|
|
ga_is_frozen(s))) {
|
|
g_critical("failed to load persistent state");
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
|
|
if (config->allowedrpcs) {
|
|
@@ -1465,7 +1465,7 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
#ifndef _WIN32
|
|
if (!register_signal_handlers()) {
|
|
g_critical("failed to register signal handlers");
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
#endif
|
|
|
|
@@ -1478,12 +1478,20 @@ static GAState *initialize_agent(GAConfig *config, int socket_activation)
|
|
s->wakeup_event = CreateEvent(NULL, TRUE, FALSE, TEXT("WakeUp"));
|
|
if (s->wakeup_event == NULL) {
|
|
g_critical("CreateEvent failed");
|
|
- return NULL;
|
|
+ goto failed;
|
|
}
|
|
#endif
|
|
|
|
ga_state = s;
|
|
return s;
|
|
+failed:
|
|
+ g_free(s->pstate_filepath);
|
|
+ g_free(s->state_filepath_isfrozen);
|
|
+ if (s->log_file) {
|
|
+ fclose(s->log_file);
|
|
+ }
|
|
+ g_free(s);
|
|
+ return NULL;
|
|
}
|
|
|
|
static void cleanup_agent(GAState *s)
|
|
--
|
|
2.27.0
|
|
|