diff options
author | Li Zhijian <lizhijian@cn.fujitsu.com> | 2023-09-04 14:28:03 +0100 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-09-21 11:31:18 +0300 |
commit | 7b165fa164022b756c2b001d0a1525f98199d3ac (patch) | |
tree | e4b05a3f5e5b972e39e63d9f9460bf9caf62daa7 /hw/cxl | |
parent | 306764ee3bfd312a17af1b69e5a263a2fe6e76cb (diff) | |
download | qemu-7b165fa164022b756c2b001d0a1525f98199d3ac.zip qemu-7b165fa164022b756c2b001d0a1525f98199d3ac.tar.gz qemu-7b165fa164022b756c2b001d0a1525f98199d3ac.tar.bz2 |
hw/cxl: Fix CFMW config memory leak
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>
Diffstat (limited to 'hw/cxl')
-rw-r--r-- | hw/cxl/cxl-host.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c index 034c780..f0920da 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)); |