]> xenbits.xensource.com Git - libvirt.git/commitdiff
security: Don't overwrite error of GetProcessLabel
authorCole Robinson <crobinso@redhat.com>
Wed, 19 Jul 2017 23:18:18 +0000 (19:18 -0400)
committerCole Robinson <crobinso@redhat.com>
Thu, 20 Jul 2017 12:10:21 +0000 (08:10 -0400)
Security impls of this function already raise errors, don't
overwrite them.

src/lxc/lxc_driver.c
src/qemu/qemu_driver.c

index 6a9c528933296dbc5abcb61a1d732326d1f8eec8..6eb88b0bac053589dd562a5136e8b27b1a95d5b5 100644 (file)
@@ -1348,11 +1348,9 @@ static int lxcDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secla
         }
 
         if (virSecurityManagerGetProcessLabel(driver->securityManager,
-                                              vm->def, priv->initpid, seclabel) < 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           "%s", _("Failed to get security label"));
+                                              vm->def, priv->initpid,
+                                              seclabel) < 0)
             goto cleanup;
-        }
     }
 
     ret = 0;
index 97b23245fb6814a0d973659991f9a6f410b8f758..6568def156f46f0c251f93e364104f089cb7fe19 100644 (file)
@@ -6111,11 +6111,8 @@ static int qemuDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secl
      */
     if (virDomainObjIsActive(vm)) {
         if (qemuSecurityGetProcessLabel(driver->securityManager,
-                                        vm->def, vm->pid, seclabel) < 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           "%s", _("Failed to get security label"));
+                                        vm->def, vm->pid, seclabel) < 0)
             goto cleanup;
-        }
     }
 
     ret = 0;
@@ -6173,8 +6170,6 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom,
         for (i = 0; i < len; i++) {
             if (qemuSecurityGetProcessLabel(mgrs[i], vm->def, vm->pid,
                                             &(*seclabels)[i]) < 0) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               "%s", _("Failed to get security label"));
                 VIR_FREE(mgrs);
                 VIR_FREE(*seclabels);
                 goto cleanup;