From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 4 Dec 2013 15:23:11 +0000 (+0000)
Subject: Don't overwrite errors from virConfReadFile
X-Git-Tag: CVE-2013-6436~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d75d8b46f820c92e701c2f99a2bc6c62d0513092;p=thirdparty%2Flibvirt.git

Don't overwrite errors from virConfReadFile

The SELinux security driver would overwrite errors from the
virConfReadFile function.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index ace9cc0ead..11c0c3bd99 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -414,13 +414,8 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr)
     }
 # endif
 
-    selinux_conf = virConfReadFile(selinux_lxc_contexts_path(), 0);
-    if (!selinux_conf) {
-        virReportSystemError(errno,
-                             _("cannot open SELinux lxc contexts file '%s'"),
-                             selinux_lxc_contexts_path());
+    if (!(selinux_conf = virConfReadFile(selinux_lxc_contexts_path(), 0)))
         goto error;
-    }
 
     scon = virConfGetValue(selinux_conf, "process");
     if (! scon || scon->type != VIR_CONF_STRING || (! scon->str)) {