motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/mem/cxl_type3: Fix special_ops memory leak on msix_init_exclusive_bar() failure

Browse source 
Address a memory leak issue by ensuring `regs->special_ops` is freed when
`msix_init_exclusive_bar()` encounters an error during CXL Type3 device
initialization.

Additionally, this patch renames err_address_space_free to err_msix_uninit
for better clarity and logical flow

Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Message-Id: <20250203161908.145406-4-Jonathan.Cameron@huawei.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Li Zhijian 2025-02-03 16:19:06 +00:00 • committed by Michael S. Tsirkin
parent 0401c4328f
commit 06953e7e5e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/mem/cxl_type3.c
View file

@ -893,7 +893,7 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)
/* MSI(-X) Initialization */ /* MSI(-X) Initialization */
rc = msix_init_exclusive_bar(pci_dev, CXL_T3_MSIX_VECTOR_NR, 4, NULL); rc = msix_init_exclusive_bar(pci_dev, CXL_T3_MSIX_VECTOR_NR, 4, NULL);
if (rc) { if (rc) {
goto err_address_space_free; goto err_free_special_ops;
} }
for (i = 0; i < CXL_T3_MSIX_VECTOR_NR; i++) { for (i = 0; i < CXL_T3_MSIX_VECTOR_NR; i++) {
msix_vector_use(pci_dev, i); msix_vector_use(pci_dev, i);
@ -907,7 +907,7 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)
cxl_cstate->cdat.free_cdat_table = ct3_free_cdat_table; cxl_cstate->cdat.free_cdat_table = ct3_free_cdat_table;
cxl_cstate->cdat.private = ct3d; cxl_cstate->cdat.private = ct3d;
if (!cxl_doe_cdat_init(cxl_cstate, errp)) { if (!cxl_doe_cdat_init(cxl_cstate, errp)) {
goto err_free_special_ops; goto err_msix_uninit;
} }
pcie_cap_deverr_init(pci_dev); pcie_cap_deverr_init(pci_dev);
@ -943,10 +943,10 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)
err_release_cdat: err_release_cdat:
cxl_doe_cdat_release(cxl_cstate); cxl_doe_cdat_release(cxl_cstate);
err_free_special_ops: err_msix_uninit:
msix_uninit_exclusive_bar(pci_dev); msix_uninit_exclusive_bar(pci_dev);
err_free_special_ops:
g_free(regs->special_ops); g_free(regs->special_ops);
err_address_space_free:
if (ct3d->dc.host_dc) { if (ct3d->dc.host_dc) {
cxl_destroy_dc_regions(ct3d); cxl_destroy_dc_regions(ct3d);
address_space_destroy(&ct3d->dc.host_dc_as); address_space_destroy(&ct3d->dc.host_dc_as);