]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Don't crash when create fails early
authorMartin Kletzander <mkletzan@redhat.com>
Tue, 2 Feb 2016 21:08:59 +0000 (22:08 +0100)
committerMartin Kletzander <mkletzan@redhat.com>
Wed, 3 Feb 2016 10:01:42 +0000 (11:01 +0100)
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>
src/security/security_selinux.c

index 9e986350fbb14f35845951384468cc8f49670ec7..6a32f0a27f12673ce688b6ca018a91f1650ada0a 100644 (file)
@@ -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) {