From: Martin Kletzander <mkletzan@redhat.com>
Date: Tue, 2 Feb 2016 21:08:59 +0000 (+0100)
Subject: qemu: Don't crash when create fails early
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1794a0103ae4fa91d9c11617e7981471173e27ce;p=libvirt.git

qemu: Don't crash when create fails early

Since commit 714080791778e3dfbd484ccb3953bffd820b8ba9 we are generating
socket path later than before -- when starting a domain.  That makes one
particular inconsistent state of a chardev, which was not possible
before, currently valid.  However, SELinux security driver forgot to
guard the main restoring function by a check for NULL-paths.  So make it
no-op for NULL paths, as in the DAC driver.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1300532

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

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 9e986350fb..6a32f0a27f 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1024,6 +1024,12 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr,
     char *newpath = NULL;
     char ebuf[1024];
 
+    /* Some paths are auto-generated, so let's be safe here and do
+     * nothing if nothing is needed.
+     */
+    if (!path)
+        return 0;
+
     VIR_INFO("Restoring SELinux context on '%s'", path);
 
     if (virFileResolveLink(path, &newpath) < 0) {