[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.9-2

[Guido Günther]

The following commit has been merged in the master branch:
commit bf94bbd35ee56cce29fe6c1ac480e0261fd07aad
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Feb 3 17:40:02 2012 +0100

    xen: Don't crash when we fail to init caps
    
    Closes: #656075

diff --git a/debian/patches/series b/debian/patches/series
index 53c08fe..6a87dd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
+xen-Don-t-crash-when-we-fail-to-init-caps.patch
diff --git a/debian/patches/xen-Don-t-crash-when-we-fail-to-init-caps.patch b/debian/patches/xen-Don-t-crash-when-we-fail-to-init-caps.patch
new file mode 100644
index 0000000..d41a677
--- /dev/null
+++ b/debian/patches/xen-Don-t-crash-when-we-fail-to-init-caps.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Fri, 20 Jan 2012 08:56:39 +0100
+Subject: xen: Don't crash when we fail to init caps
+
+by dereferencing a NULL pointer in the call to
+virNodeSuspendGetTargetMask.
+---
+ src/xen/xen_hypervisor.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
+index 5357ac1..6d8dda7 100644
+--- a/src/xen/xen_hypervisor.c
++++ b/src/xen/xen_hypervisor.c
+@@ -2802,6 +2802,8 @@ xenHypervisorMakeCapabilities(virConnectPtr conn)
+                                                  utsname.machine,
+                                                  cpuinfo,
+                                                  capabilities);
++    if (caps == NULL)
++        return NULL;
+ 
+     if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0)
+         VIR_WARN("Failed to get host power management capabilities");

-- 
Libvirt Debian packaging