From: Eric Blake <eblake@redhat.com>
Date: Tue, 3 May 2011 15:29:26 +0000 (-0600)
Subject: pci: fix null pointer dereference
X-Git-Tag: v0.9.1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1164e1a2da822d96534c2535b2fb4e71d0789f36;p=thirdparty%2Flibvirt.git

pci: fix null pointer dereference

Clang detected a null-pointer dereference regression, introduced
in commit 4e8969eb.  Without this patch, a device with
unbind_from_stub set to false would eventually try to call
virFileExists on uncomputed drvdir.

* src/util/pci.c (pciUnbindDeviceFromStub): Ensure drvdir is set
before use.
---

diff --git a/src/util/pci.c b/src/util/pci.c
index 945f32a9b6..d7f74f9b71 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -879,15 +879,16 @@ pciUnbindDeviceFromStub(pciDevice *dev, const char *driver)
     char *drvdir = NULL;
     char *path = NULL;
 
+    if (pciDriverDir(&drvdir, driver) < 0)
+        goto cleanup;
+
     if (!dev->unbind_from_stub)
         goto remove_slot;
 
     /* If the device is bound to stub, unbind it.
      */
-    if (pciDriverDir(&drvdir, driver) < 0 ||
-        pciDeviceFile(&path, dev->name, "driver") < 0) {
+    if (pciDeviceFile(&path, dev->name, "driver") < 0)
         goto cleanup;
-    }
 
     if (virFileExists(drvdir) && virFileLinkPointsTo(path, drvdir)) {
         if (pciDriverFile(&path, driver, "unbind") < 0) {