[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/17] hw/cxl: Fix CFMW config memory leak
From: |
Michael Tokarev |
Subject: |
[PULL 10/17] hw/cxl: Fix CFMW config memory leak |
Date: |
Thu, 21 Sep 2023 11:34:59 +0300 |
From: Li Zhijian <lizhijian@cn.fujitsu.com>
Allocate targets and targets[n] resources when all sanity checks are
passed to avoid memory leaks.
Cc: qemu-stable@nongnu.org
Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Fan Ni <fan.ni@samsung.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/cxl/cxl-host.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c
index 034c7805b3..f0920da956 100644
--- a/hw/cxl/cxl-host.c
+++ b/hw/cxl/cxl-host.c
@@ -39,12 +39,6 @@ static void cxl_fixed_memory_window_config(CXLState
*cxl_state,
return;
}
- fw->targets = g_malloc0_n(fw->num_targets, sizeof(*fw->targets));
- for (i = 0, target = object->targets; target; i++, target = target->next) {
- /* This link cannot be resolved yet, so stash the name for now */
- fw->targets[i] = g_strdup(target->value);
- }
-
if (object->size % (256 * MiB)) {
error_setg(errp,
"Size of a CXL fixed memory window must be a multiple of
256MiB");
@@ -64,6 +58,12 @@ static void cxl_fixed_memory_window_config(CXLState
*cxl_state,
fw->enc_int_gran = 0;
}
+ fw->targets = g_malloc0_n(fw->num_targets, sizeof(*fw->targets));
+ for (i = 0, target = object->targets; target; i++, target = target->next) {
+ /* This link cannot be resolved yet, so stash the name for now */
+ fw->targets[i] = g_strdup(target->value);
+ }
+
cxl_state->fixed_windows = g_list_append(cxl_state->fixed_windows,
g_steal_pointer(&fw));
--
2.39.2
- [PULL 00/17] Trivial patches for 2023-09-21, Michael Tokarev, 2023/09/21
- [PULL 01/17] ppc: spelling fixes, Michael Tokarev, 2023/09/21
- [PULL 06/17] hw/tpm: spelling fixes, Michael Tokarev, 2023/09/21
- [PULL 03/17] i386: spelling fixes, Michael Tokarev, 2023/09/21
- [PULL 02/17] bsd-user: spelling fixes, Michael Tokarev, 2023/09/21
- [PULL 05/17] hw/pci: spelling fixes, Michael Tokarev, 2023/09/21
- [PULL 09/17] hw/i386/pc: fix code comment on cumulative flash size, Michael Tokarev, 2023/09/21
- [PULL 10/17] hw/cxl: Fix CFMW config memory leak,
Michael Tokarev <=
- [PULL 08/17] subprojects: Use the correct .git suffix in the repository URLs, Michael Tokarev, 2023/09/21
- [PULL 04/17] hw/net: spelling fixes, Michael Tokarev, 2023/09/21
- [PULL 07/17] hw/other: spelling fixes, Michael Tokarev, 2023/09/21
- [PULL 11/17] hw/pci-bridge/cxl_upstream: Fix bandwidth entry base unit for SSLBIS, Michael Tokarev, 2023/09/21
- [PULL 12/17] hw/cxl/cxl_device: Replace magic number in CXLError definition, Michael Tokarev, 2023/09/21
- [PULL 14/17] hw/cxl: Fix out of bound array access, Michael Tokarev, 2023/09/21
- [PULL 13/17] docs/cxl: Change to lowercase as others, Michael Tokarev, 2023/09/21
- [PULL 15/17] hw/mem/cxl_type3: Add missing copyright and license notice, Michael Tokarev, 2023/09/21
- [PULL 16/17] docs/cxl: Cleanout some more aarch64 examples., Michael Tokarev, 2023/09/21
- [PULL 17/17] docs/devel/reset.rst: Correct function names, Michael Tokarev, 2023/09/21