diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 272026623eced7581b1caed1a4eb4ec672f2022f..b9f5a7b81b847b7fc2f2e041df556e004cfab652 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -58,6 +58,7 @@ typedef virSecuritySELinuxCallbackData *virSecuritySELinuxCallbackDataPtr; struct _virSecuritySELinuxData { char *domain_context; + char *alt_domain_context; char *file_context; char *content_context; virHashTablePtr mcs; @@ -475,8 +476,23 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) } ptr = strchrnul(data->domain_context, '\n'); - if (ptr) + if (ptr && *ptr == '\n') { *ptr = '\0'; + ptr++; + if (*ptr != '\0') { + data->alt_domain_context = strdup(ptr); + if (!data->alt_domain_context) { + virReportOOMError(); + goto error; + } + ptr = strchrnul(data->alt_domain_context, '\n'); + if (ptr && *ptr == '\n') + *ptr = '\0'; + } + } + VIR_DEBUG("Loaded domain context '%s', alt domain context '%s'", + data->domain_context, NULLSTR(data->alt_domain_context)); + if (virFileReadAll(selinux_virtual_image_context_path(), 2*MAX_CONTEXT, &(data->file_context)) < 0) { virReportSystemError(errno, @@ -498,6 +514,9 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) *ptr = '\0'; } + VIR_DEBUG("Loaded file context '%s', content context '%s'", + data->file_context, data->content_context); + if (!(data->mcs = virHashCreate(10, NULL))) goto error; @@ -508,6 +527,7 @@ error: selabel_close(data->label_handle); #endif VIR_FREE(data->domain_context); + VIR_FREE(data->alt_domain_context); VIR_FREE(data->file_context); VIR_FREE(data->content_context); virHashFree(data->mcs); @@ -538,6 +558,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, const char *range; virSecurityLabelDefPtr seclabel; virSecuritySELinuxDataPtr data; + const char *baselabel; if (mgr == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -600,10 +621,28 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (virSecuritySELinuxMCSAdd(mgr, mcs) < 0) goto cleanup; + baselabel = seclabel->baselabel; + if (!baselabel) { + if (def->virtType == VIR_DOMAIN_VIRT_QEMU) { + if (data->alt_domain_context == NULL) { + static bool warned = false; + if (!warned) { + VIR_WARN("SELinux policy does not define a domain type for QEMU TCG. " + "Guest startup may be denied due to missing 'execmem' privilege " + "unless the 'virt_use_execmem' policy boolean is enabled"); + warned = true; + } + baselabel = data->domain_context; + } else { + baselabel = data->alt_domain_context; + } + } else { + baselabel = data->domain_context; + } + } + seclabel->label = - virSecuritySELinuxGenNewContext(seclabel->baselabel ? - seclabel->baselabel : - data->domain_context, mcs, false); + virSecuritySELinuxGenNewContext(baselabel, mcs, false); if (!seclabel->label) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); @@ -758,6 +797,7 @@ virSecuritySELinuxSecurityDriverClose(virSecurityManagerPtr mgr) virHashFree(data->mcs); VIR_FREE(data->domain_context); + VIR_FREE(data->alt_domain_context); VIR_FREE(data->file_context); VIR_FREE(data->content_context);