From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 25 May 2016 08:01:58 +0000 (+0200)
Subject: pci: Fix virPCIGetPhysicalFunction()'s callers
X-Git-Tag: v1.3.5-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9ba9d574e5ac243b5755cc0c314b798e993dcf;p=thirdparty%2Flibvirt.git

pci: Fix virPCIGetPhysicalFunction()'s callers

Commit c8b1a83605e4 changed the function, making it
impossible for callers to be able to tell whether a
non-negative return value means "physical function
address found and parsed correctly" or "couldn't find
corresponding physical function".

The important difference between the two being that,
in the latter case, the returned pointer is NULL and
should never, ever be dereferenced.

In order to cope with these changes, the callers
have to be updated.
---

diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c
index 24a6a2eaa5..549d32c4b9 100644
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -154,19 +154,25 @@ nodeDeviceSysfsGetPCISRIOVCaps(const char *sysfsPath,
     data->pci_dev.flags &= ~VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION;
     data->pci_dev.flags &= ~VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION;
 
-    if (!virPCIGetPhysicalFunction(sysfsPath, &data->pci_dev.physical_function))
+    ret = virPCIGetPhysicalFunction(sysfsPath,
+                                    &data->pci_dev.physical_function);
+    if (ret < 0)
+        goto cleanup;
+
+    if (data->pci_dev.physical_function)
         data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION;
 
     ret = virPCIGetVirtualFunctions(sysfsPath, &data->pci_dev.virtual_functions,
                                     &data->pci_dev.num_virtual_functions,
                                     &data->pci_dev.max_virtual_functions);
     if (ret < 0)
-        return ret;
+        goto cleanup;
 
     if (data->pci_dev.num_virtual_functions > 0 ||
         data->pci_dev.max_virtual_functions > 0)
         data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION;
 
+ cleanup:
     return ret;
 }
 
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 28da294872..095d7068c2 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -2732,6 +2732,9 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,
     if (virPCIGetPhysicalFunction(vf_sysfs_device_path, &pf_config_address) < 0)
         return ret;
 
+    if (!pf_config_address)
+        return ret;
+
     if (virPCIDeviceAddressGetSysfsFile(pf_config_address,
                                         &pf_sysfs_device_path) < 0) {