External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 18:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Report an error when default TPM model is provided

Browse Source 
When "default" model of a TPM was provided, our parses accepts it
happily even though the value is forbidden by our RNG and not
documented as accepted value. This is because of < 0 vs <= 0
comparison of virDomainTPMModelTypeFromString() retval.

Make the parser error out explicitly in this case. Users can
always chose to not specify the attribute in which case we pick a
sane default (in qemuDomainTPMDefPostParse()).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2022-07-18 09:11:19 +02:00
parent bad581466e
commit 3f7c63bba5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -10377,7 +10377,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
model = virXMLPropString(node, "model"); model = virXMLPropString(node, "model");
if (model != NULL && if (model != NULL &&
(def->model = virDomainTPMModelTypeFromString(model)) < 0) { (def->model = virDomainTPMModelTypeFromString(model)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown TPM frontend model '%s'"), model); _("Unknown TPM frontend model '%s'"), model);
goto error; goto error;
@ -24230,8 +24230,10 @@ virDomainTPMDefFormat(virBuffer *buf,
g_auto(virBuffer) backendAttrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) backendAttrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) backendChildBuf = VIR_BUFFER_INIT_CHILD(&childBuf); g_auto(virBuffer) backendChildBuf = VIR_BUFFER_INIT_CHILD(&childBuf);
virBufferAsprintf(&attrBuf, " model='%s'", if (def->model != VIR_DOMAIN_TPM_MODEL_DEFAULT) {
virDomainTPMModelTypeToString(def->model)); virBufferAsprintf(&attrBuf, " model='%s'",
virDomainTPMModelTypeToString(def->model));
}
virBufferAsprintf(&backendAttrBuf, " type='%s'", virBufferAsprintf(&backendAttrBuf, " type='%s'",
virDomainTPMBackendTypeToString(def->type)); virDomainTPMBackendTypeToString(def->type));

2
src/conf/domain_conf.h
View File

@ -1400,7 +1400,7 @@ struct _virDomainHubDef {
}; };
typedef enum { typedef enum {
VIR_DOMAIN_TPM_MODEL_DEFAULT, VIR_DOMAIN_TPM_MODEL_DEFAULT = 0,
VIR_DOMAIN_TPM_MODEL_TIS, VIR_DOMAIN_TPM_MODEL_TIS,
VIR_DOMAIN_TPM_MODEL_CRB, VIR_DOMAIN_TPM_MODEL_CRB,
VIR_DOMAIN_TPM_MODEL_SPAPR, VIR_DOMAIN_TPM_MODEL_SPAPR,