External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-29 00:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: Don't crash if no security driver is specified in libvirt_lxc

Browse Source 
When no security driver is specified libvirt_lxc segfaults as a debug
message tries to access security labels for the container that are not
present.

This problem was introduced in commit 6c3cf57d6c.
(cherry picked from commit 99a388e612)
This commit is contained in:
Peter Krempa 2012-11-26 15:17:58 +01:00 committed by Cole Robinson
parent fac1a19dfc
commit bf8efc3398
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/lxc_controller.c
View File

@ -1589,11 +1589,15 @@ int main(int argc, char *argv[])
false, false, false))) false, false, false)))
goto cleanup; goto cleanup;
VIR_DEBUG("Security model %s type %s label %s imagelabel %s", if (ctrl->def->seclabels) {
NULLSTR(ctrl->def->seclabels[0]->model), VIR_DEBUG("Security model %s type %s label %s imagelabel %s",
virDomainSeclabelTypeToString(ctrl->def->seclabels[0]->type), NULLSTR(ctrl->def->seclabels[0]->model),
NULLSTR(ctrl->def->seclabels[0]->label), virDomainSeclabelTypeToString(ctrl->def->seclabels[0]->type),
NULLSTR(ctrl->def->seclabels[0]->imagelabel)); NULLSTR(ctrl->def->seclabels[0]->label),
NULLSTR(ctrl->def->seclabels[0]->imagelabel));
} else {
VIR_DEBUG("Security model not initialized");
}
ctrl->veths = veths; ctrl->veths = veths;
ctrl->nveths = nveths; ctrl->nveths = nveths;