selinux: Always generate imagelabel

The imagelabel SELinux label was only generated when relabeling was
enabled. This prohibited labeling of files created by libvirt that need
to be labeled even if relabeling is turned off.

The only codepath this change has direct impact on is labeling of FDs
passed to qemu which is always safe in current state.
This commit is contained in:
Peter Krempa 2013-07-02 18:34:58 +02:00
parent e45ee23c59
commit 2ce63c1611

View File

@ -687,13 +687,12 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
goto cleanup; goto cleanup;
} }
if (!seclabel->norelabel) { /* always generate a image label, needed to label new objects */
seclabel->imagelabel = virSecuritySELinuxGenNewContext(data->file_context, seclabel->imagelabel = virSecuritySELinuxGenNewContext(data->file_context,
mcs, mcs,
true); true);
if (!seclabel->imagelabel) if (!seclabel->imagelabel)
goto cleanup; goto cleanup;
}
if (!seclabel->model && if (!seclabel->model &&
VIR_STRDUP(seclabel->model, SECURITY_SELINUX_NAME) < 0) VIR_STRDUP(seclabel->model, SECURITY_SELINUX_NAME) < 0)