From: Martin Kletzander <mkletzan@redhat.com>
Date: Thu, 30 Oct 2014 08:56:26 +0000 (+0100)
Subject: vbox: don't register NULL driver
X-Git-Tag: CVE-2014-7823~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55bbc342183a721170be641efac6166bb0cf65d9;p=thirdparty%2Flibvirt.git

vbox: don't register NULL driver

We were missing check for the fact that the storage driver was found and
in case there is no vbox storage driver available, daemon raised the
following error each start:

  error : virRegisterStorageDriver:592 : driver in
  virRegisterStorageDriver must not be NULL

Fixing this makes the condition unified with networkDriver registration
in vbox as well.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index c64d2d610a..b2e35e9544 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -74,7 +74,7 @@ int vboxStorageRegister(void)
     if (VBoxCGlueInit(&uVersion) == 0)
         storageDriver = vboxGetStorageDriver(uVersion);
 
-    if (virRegisterStorageDriver(storageDriver) < 0)
+    if (storageDriver && virRegisterStorageDriver(storageDriver) < 0)
         return -1;
     return 0;
 }