qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Cornelia Huck <cohuck@redhat.com>, David Hildenbrand <david@redhat.com>
Subject: [PATCH v2 15/18] s390x/cpumodel: Fix query-cpu-definitions error API violations
Date: Wed,  4 Dec 2019 10:36:22 +0100	[thread overview]
Message-ID: <20191204093625.14836-16-armbru@redhat.com> (raw)
In-Reply-To: <20191204093625.14836-1-armbru@redhat.com>

qmp_query_cpu_definitions() passes @errp to get_max_cpu_model(), then
frees any error it gets back.  This effectively ignores errors.
Dereferencing @errp is wrong; see the big comment in error.h.  Passing
@errp is also wrong, because it works only as long as @errp is neither
@error_fatal nor @error_abort.  Introduced in commit 38cba1f4d8
"s390x: return unavailable features via query-cpu-definitions".

No caller actually passes such @errp values.

Fix anyway: simply pass NULL to get_max_cpu_model().

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>
---
 target/s390x/cpu_models.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 3ed301b5e5..547bab8ac3 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -462,11 +462,7 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
         .list = NULL,
     };
 
-    list_data.model = get_max_cpu_model(errp);
-    if (*errp) {
-        error_free(*errp);
-        *errp = NULL;
-    }
+    list_data.model = get_max_cpu_model(NULL);
 
     object_class_foreach(create_cpu_model_list, TYPE_S390_CPU, false,
                          &list_data);
-- 
2.21.0



  parent reply	other threads:[~2019-12-04 10:36 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-04  9:36 [PATCH v2 00/18] Error handling fixes Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 01/18] crypto: Fix certificate file error handling crash bug Markus Armbruster
2019-12-04  9:45   ` Daniel P. Berrangé
2019-12-04  9:36 ` [PATCH v2 02/18] crypto: Fix typo in QCryptoTLSSession's <example> comment Markus Armbruster
2019-12-04  9:45   ` Daniel P. Berrangé
2019-12-04  9:36 ` [PATCH v2 03/18] io: Fix Error usage in a comment <example> Markus Armbruster
2019-12-04  9:45   ` Daniel P. Berrangé
2019-12-04  9:36 ` [PATCH v2 04/18] tests: Clean up initialization of Error *err variables Markus Armbruster
2019-12-04 14:27   ` Eric Blake
2019-12-04 14:53   ` Philippe Mathieu-Daudé
2019-12-04  9:36 ` [PATCH v2 05/18] exec: Fix file_ram_alloc() error API violations Markus Armbruster
2019-12-04 14:53   ` Philippe Mathieu-Daudé
2019-12-04  9:36 ` [PATCH v2 06/18] hw/acpi: Fix legacy CPU plug " Markus Armbruster
2019-12-09 16:01   ` Michael S. Tsirkin
2019-12-04  9:36 ` [PATCH v2 07/18] hw/core: Fix fit_load_fdt() error handling violations Markus Armbruster
2019-12-04 14:55   ` Philippe Mathieu-Daudé
2019-12-04  9:36 ` [PATCH v2 08/18] hw/ipmi: Fix realize() error API violations Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 09/18] qga: Fix guest-get-fsinfo " Markus Armbruster
2019-12-04 14:57   ` Philippe Mathieu-Daudé
2019-12-04  9:36 ` [PATCH v2 10/18] memory-device: Fix memory pre-plug " Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 11/18] s390x/event-facility: Fix realize() " Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 12/18] s390x/cpumodel: Fix feature property " Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 13/18] s390x/cpumodel: Fix realize() " Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 14/18] s390x/cpumodel: Fix query-cpu-model-FOO " Markus Armbruster
2019-12-04  9:36 ` Markus Armbruster [this message]
2019-12-04  9:36 ` [PATCH v2 16/18] error: Clean up unusual names of Error * variables Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 17/18] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize() Markus Armbruster
2019-12-04  9:36 ` [PATCH v2 18/18] tests-blockjob: Use error_free_or_abort() Markus Armbruster
2019-12-04  9:38 ` [PATCH v2 00/18] Error handling fixes David Hildenbrand
2019-12-04  9:49 ` Markus Armbruster
2019-12-05 16:07 ` Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191204093625.14836-16-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).