ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr_pci: Fix leak in spapr_phb_vfio_get_loc_code() with g_autofree 

This uses g_autofree to simplify logic in spapr_phb_vfio_get_loc_code(),
in the process fixing a leak in one of the paths.  I'm told this fixes
Coverity error CID 1460454

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Fixes: 16b0ea1d85 ("spapr_pci: populate ibm,loc-code")
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2021-08-10 14:28:19 +10:00
parent 585edbb0a1
commit a4e4c4b45f
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/ppc/spapr_pci.c
View File

@ -782,33 +782,29 @@ static AddressSpace *spapr_pci_dma_iommu(PCIBus *bus, void *opaque, int devfn)
static char *spapr_phb_vfio_get_loc_code(SpaprPhbState *sphb, PCIDevice *pdev) static char *spapr_phb_vfio_get_loc_code(SpaprPhbState *sphb, PCIDevice *pdev)
{ {
char *path = NULL, *buf = NULL, *host = NULL; g_autofree char *path = NULL;
g_autofree char *host = NULL;
g_autofree char *devspec = NULL;
char *buf = NULL;
/* Get the PCI VFIO host id */ /* Get the PCI VFIO host id */
host = object_property_get_str(OBJECT(pdev), "host", NULL); host = object_property_get_str(OBJECT(pdev), "host", NULL);
if (!host) { if (!host) {
goto err_out; return NULL;
} }
/* Construct the path of the file that will give us the DT location */ /* Construct the path of the file that will give us the DT location */
path = g_strdup_printf("/sys/bus/pci/devices/%s/devspec", host); path = g_strdup_printf("/sys/bus/pci/devices/%s/devspec", host);
g_free(host); if (!g_file_get_contents(path, &devspec, NULL, NULL)) {
if (!g_file_get_contents(path, &buf, NULL, NULL)) { return NULL;
goto err_out;
} }
g_free(path);
/* Construct and read from host device tree the loc-code */ /* Construct and read from host device tree the loc-code */
path = g_strdup_printf("/proc/device-tree%s/ibm,loc-code", buf); path = g_strdup_printf("/proc/device-tree%s/ibm,loc-code", devspec);
g_free(buf);
if (!g_file_get_contents(path, &buf, NULL, NULL)) { if (!g_file_get_contents(path, &buf, NULL, NULL)) {
goto err_out; return NULL;
} }
return buf; return buf;
err_out:
g_free(path);
return NULL;
} }
static char *spapr_phb_get_loc_code(SpaprPhbState *sphb, PCIDevice *pdev) static char *spapr_phb_get_loc_code(SpaprPhbState *sphb, PCIDevice *pdev)