External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building domain def in securityselinuxtest

Browse Source 
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].
This commit is contained in:
Jim Fehlig 2017-08-16 15:45:54 -06:00
parent 6134dc2a6b
commit ff7e0a1a40
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/securityselinuxtest.c
View File

@ -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: