From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 17 Mar 2010 20:04:11 +0000 (+0100)
Subject: Don't crash without a security driver
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b7a7b3365145f6e9e434a3265a58666cd2e6d8dd;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

Don't crash without a security driver

"virsh dominfo <vm>" crashes if there's no primary security driver set
since we only intialize the secmodel.model and secmodel.doi if we have
one. Attached patch checks for securityPrimaryDriver instead of
securityDriver since the later is always set in qemudSecurityInit().

Closes: http://bugs.debian.org/574359
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1f2b11dbc..257f91466 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4979,7 +4979,7 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn,
     int ret = 0;
 
     qemuDriverLock(driver);
-    if (!driver->securityDriver) {
+    if (!driver->securityPrimaryDriver) {
         memset(secmodel, 0, sizeof (*secmodel));
         goto cleanup;
     }