vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/cpumodel: Fix query-cpu-model-FOO error API violations 

cpu_model_from_info() is a helper for qmp_query_cpu_model_expansion(),
qmp_query_cpu_model_comparison(), qmp_query_cpu_model_baseline().  It
dereferences @errp when the visitor or the QOM setter fails.  That's
wrong; see the big comment in error.h.  Introduced in commit
137974cea3 's390x/cpumodel: implement QMP interface
"query-cpu-model-expansion"'.

Its three callers have the same issue.  Introduced in commit
4e82ef0502 's390x/cpumodel: implement QMP interface
"query-cpu-model-comparison"' and commit f1a47d08ef 's390x/cpumodel:
implement QMP interface "query-cpu-model-baseline"'.

No caller actually passes null.

Fix anyway: splice in a local Error *err, and error_propagate().

Cc: David Hildenbrand <david@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20191204093625.14836-15-armbru@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
master
Markus Armbruster 2019-12-04 10:36:21 +01:00 committed by Cornelia Huck
parent d687ae1ae2
commit e47970f51d
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
target/s390x/cpu_models.c
View File

@ -477,6 +477,7 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info, static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info,
Error **errp) Error **errp)
{ {
Error *err = NULL;
const QDict *qdict = NULL; const QDict *qdict = NULL;
const QDictEntry *e; const QDictEntry *e;
Visitor *visitor; Visitor *visitor;
@ -513,24 +514,26 @@ static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info,
if (qdict) { if (qdict) {
visitor = qobject_input_visitor_new(info->props); visitor = qobject_input_visitor_new(info->props);
visit_start_struct(visitor, NULL, NULL, 0, errp); visit_start_struct(visitor, NULL, NULL, 0, &err);
if (*errp) { if (err) {
error_propagate(errp, err);
visit_free(visitor); visit_free(visitor);
object_unref(obj); object_unref(obj);
return; return;
} }
for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) { for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
object_property_set(obj, visitor, e->key, errp); object_property_set(obj, visitor, e->key, &err);
if (*errp) { if (err) {
break; break;
} }
} }
if (!*errp) { if (!err) {
visit_check_struct(visitor, errp); visit_check_struct(visitor, errp);
} }
visit_end_struct(visitor, NULL); visit_end_struct(visitor, NULL);
visit_free(visitor); visit_free(visitor);
if (*errp) { if (err) {
error_propagate(errp, err);
object_unref(obj); object_unref(obj);
return; return;
} }
@ -595,13 +598,15 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
CpuModelInfo *model, CpuModelInfo *model,
Error **errp) Error **errp)
{ {
Error *err = NULL;
CpuModelExpansionInfo *expansion_info = NULL; CpuModelExpansionInfo *expansion_info = NULL;
S390CPUModel s390_model; S390CPUModel s390_model;
bool delta_changes = false; bool delta_changes = false;
/* convert it to our internal representation */ /* convert it to our internal representation */
cpu_model_from_info(&s390_model, model, errp); cpu_model_from_info(&s390_model, model, &err);
if (*errp) { if (err) {
error_propagate(errp, err);
return NULL; return NULL;
} }
@ -634,18 +639,21 @@ CpuModelCompareInfo *qmp_query_cpu_model_comparison(CpuModelInfo *infoa,
CpuModelInfo *infob, CpuModelInfo *infob,
Error **errp) Error **errp)
{ {
Error *err = NULL;
CpuModelCompareResult feat_result, gen_result; CpuModelCompareResult feat_result, gen_result;
CpuModelCompareInfo *compare_info; CpuModelCompareInfo *compare_info;
S390FeatBitmap missing, added; S390FeatBitmap missing, added;
S390CPUModel modela, modelb; S390CPUModel modela, modelb;
/* convert both models to our internal representation */ /* convert both models to our internal representation */
cpu_model_from_info(&modela, infoa, errp); cpu_model_from_info(&modela, infoa, &err);
if (*errp) { if (err) {
error_propagate(errp, err);
return NULL; return NULL;
} }
cpu_model_from_info(&modelb, infob, errp); cpu_model_from_info(&modelb, infob, &err);
if (*errp) { if (err) {
error_propagate(errp, err);
return NULL; return NULL;
} }
compare_info = g_new0(CpuModelCompareInfo, 1); compare_info = g_new0(CpuModelCompareInfo, 1);
@ -707,6 +715,7 @@ CpuModelBaselineInfo *qmp_query_cpu_model_baseline(CpuModelInfo *infoa,
CpuModelInfo *infob, CpuModelInfo *infob,
Error **errp) Error **errp)
{ {
Error *err = NULL;
CpuModelBaselineInfo *baseline_info; CpuModelBaselineInfo *baseline_info;
S390CPUModel modela, modelb, model; S390CPUModel modela, modelb, model;
uint16_t cpu_type; uint16_t cpu_type;
@ -714,13 +723,15 @@ CpuModelBaselineInfo *qmp_query_cpu_model_baseline(CpuModelInfo *infoa,
uint8_t max_gen; uint8_t max_gen;
/* convert both models to our internal representation */ /* convert both models to our internal representation */
cpu_model_from_info(&modela, infoa, errp); cpu_model_from_info(&modela, infoa, &err);
if (*errp) { if (err) {
error_propagate(errp, err);
return NULL; return NULL;
} }
cpu_model_from_info(&modelb, infob, errp); cpu_model_from_info(&modelb, infob, &err);
if (*errp) { if (err) {
error_propagate(errp, err);
return NULL; return NULL;
} }