File ff7e0a1a-fix-securityselinuxtest.patch of Package libvirt.10498

Overview Repositories Revisions Requests Users Attributes Meta

File ff7e0a1a-fix-securityselinuxtest.patch of Package libvirt.10498

commit ff7e0a1a40d69d69613d8fb88eb0263fc1121a8d
Author: Jim Fehlig <jfehlig@suse.com>
Date:   Wed Aug 16 15:45:54 2017 -0600

Fix building domain def in securityselinuxtest
    
    The virDomainDef created by testBuildDomainDef in securityselinuxtest
    adds a seclabel but does not increment nseclabels. Also, it should
    populate seclabel->model with 'selinux'.
    
    While at it, use the secdef itself to populate values instead of
    the indirection through def->seclabels[0].

Index: libvirt-2.0.0/tests/securityselinuxtest.c
===================================================================
--- libvirt-2.0.0.orig/tests/securityselinuxtest.c
+++ libvirt-2.0.0/tests/securityselinuxtest.c
@@ -73,24 +73,27 @@ testBuildDomainDef(bool dynamic,
     if (!(def = virDomainDefNew()))
         goto error;
 
+    def->virtType = VIR_DOMAIN_VIRT_KVM;
     if (VIR_ALLOC_N(def->seclabels, 1) < 0)
         goto error;
 
     if (VIR_ALLOC(secdef) < 0)
         goto error;
 
-    def->virtType = VIR_DOMAIN_VIRT_KVM;
-    def->seclabels[0] = secdef;
-    def->seclabels[0]->type = dynamic ? VIR_DOMAIN_SECLABEL_DYNAMIC : VIR_DOMAIN_SECLABEL_STATIC;
+    if (VIR_STRDUP(secdef->model, "selinux") < 0)
+        goto error;
 
+    secdef->type = dynamic ? VIR_DOMAIN_SECLABEL_DYNAMIC : VIR_DOMAIN_SECLABEL_STATIC;
     if (label &&
-        VIR_STRDUP(def->seclabels[0]->label, label) < 0)
+        VIR_STRDUP(secdef->label, label) < 0)
         goto error;
 
     if (baselabel &&
-        VIR_STRDUP(def->seclabels[0]->baselabel, baselabel) < 0)
+        VIR_STRDUP(secdef->baselabel, baselabel) < 0)
         goto error;
 
+    def->seclabels[0] = secdef;
+    def->nseclabels++;
     return def;
 
  error:

Places

File ff7e0a1a-fix-securityselinuxtest.patch of Package libvirt.10498

Places