From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Corey Minyard <cminyard@mvista.com>
Subject: [PATCH v2 08/18] hw/ipmi: Fix realize() error API violations
Date: Wed, 4 Dec 2019 10:36:15 +0100 [thread overview]
Message-ID: <20191204093625.14836-9-armbru@redhat.com> (raw)
In-Reply-To: <20191204093625.14836-1-armbru@redhat.com>
isa_ipmi_bt_realize(), ipmi_isa_realize(), pci_ipmi_bt_realize(), and
pci_ipmi_kcs_realize() dereference @errp when IPMIInterfaceClass
method init() fails. That's wrong; see the big comment in error.h.
Introduced in commit 0719029c47 "ipmi: Add an ISA KCS low-level
interface", then imitated in commit a9b74079cb "ipmi: Add a BT
low-level interface" and commit 12f983c6aa "ipmi: Add PCI IPMI
interfaces".
No caller actually passes null.
Fix anyway: splice in a local Error *err, and error_propagate().
Cc: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/ipmi/isa_ipmi_bt.c | 7 +++++--
hw/ipmi/isa_ipmi_kcs.c | 7 +++++--
hw/ipmi/pci_ipmi_bt.c | 6 ++++--
hw/ipmi/pci_ipmi_kcs.c | 6 ++++--
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 9a87ffd3f0..9fba5ed383 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -70,6 +70,7 @@ static void isa_ipmi_bt_lower_irq(IPMIBT *ib)
static void isa_ipmi_bt_realize(DeviceState *dev, Error **errp)
{
+ Error *err = NULL;
ISADevice *isadev = ISA_DEVICE(dev);
ISAIPMIBTDevice *iib = ISA_IPMI_BT(dev);
IPMIInterface *ii = IPMI_INTERFACE(dev);
@@ -85,9 +86,11 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Error **errp)
iib->bt.bmc->intf = ii;
iib->bt.opaque = iib;
- iic->init(ii, 0, errp);
- if (*errp)
+ iic->init(ii, 0, &err);
+ if (err) {
+ error_propagate(errp, err);
return;
+ }
if (iib->isairq > 0) {
isa_init_irq(isadev, &iib->irq, iib->isairq);
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index ca3ea36a3f..cc6bd817f2 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -69,6 +69,7 @@ static void isa_ipmi_kcs_lower_irq(IPMIKCS *ik)
static void ipmi_isa_realize(DeviceState *dev, Error **errp)
{
+ Error *err = NULL;
ISADevice *isadev = ISA_DEVICE(dev);
ISAIPMIKCSDevice *iik = ISA_IPMI_KCS(dev);
IPMIInterface *ii = IPMI_INTERFACE(dev);
@@ -84,9 +85,11 @@ static void ipmi_isa_realize(DeviceState *dev, Error **errp)
iik->kcs.bmc->intf = ii;
iik->kcs.opaque = iik;
- iic->init(ii, 0, errp);
- if (*errp)
+ iic->init(ii, 0, &err);
+ if (err) {
+ error_propagate(errp, err);
return;
+ }
if (iik->isairq > 0) {
isa_init_irq(isadev, &iik->irq, iik->isairq);
diff --git a/hw/ipmi/pci_ipmi_bt.c b/hw/ipmi/pci_ipmi_bt.c
index 6ed925a665..ba9cf016b5 100644
--- a/hw/ipmi/pci_ipmi_bt.c
+++ b/hw/ipmi/pci_ipmi_bt.c
@@ -54,6 +54,7 @@ static void pci_ipmi_lower_irq(IPMIBT *ik)
static void pci_ipmi_bt_realize(PCIDevice *pd, Error **errp)
{
+ Error *err = NULL;
PCIIPMIBTDevice *pik = PCI_IPMI_BT(pd);
IPMIInterface *ii = IPMI_INTERFACE(pd);
IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
@@ -74,8 +75,9 @@ static void pci_ipmi_bt_realize(PCIDevice *pd, Error **errp)
pik->bt.raise_irq = pci_ipmi_raise_irq;
pik->bt.lower_irq = pci_ipmi_lower_irq;
- iic->init(ii, 8, errp);
- if (*errp) {
+ iic->init(ii, 8, &err);
+ if (err) {
+ error_propagate(errp, err);
return;
}
pci_register_bar(pd, 0, PCI_BASE_ADDRESS_SPACE_IO, &pik->bt.io);
diff --git a/hw/ipmi/pci_ipmi_kcs.c b/hw/ipmi/pci_ipmi_kcs.c
index eeba63baa4..99f46152f4 100644
--- a/hw/ipmi/pci_ipmi_kcs.c
+++ b/hw/ipmi/pci_ipmi_kcs.c
@@ -54,6 +54,7 @@ static void pci_ipmi_lower_irq(IPMIKCS *ik)
static void pci_ipmi_kcs_realize(PCIDevice *pd, Error **errp)
{
+ Error *err = NULL;
PCIIPMIKCSDevice *pik = PCI_IPMI_KCS(pd);
IPMIInterface *ii = IPMI_INTERFACE(pd);
IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
@@ -74,8 +75,9 @@ static void pci_ipmi_kcs_realize(PCIDevice *pd, Error **errp)
pik->kcs.raise_irq = pci_ipmi_raise_irq;
pik->kcs.lower_irq = pci_ipmi_lower_irq;
- iic->init(ii, 8, errp);
- if (*errp) {
+ iic->init(ii, 8, &err);
+ if (err) {
+ error_propagate(errp, err);
return;
}
pci_register_bar(pd, 0, PCI_BASE_ADDRESS_SPACE_IO, &pik->kcs.io);
--
2.21.0
next prev parent reply other threads:[~2019-12-04 10:31 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 ` Markus Armbruster [this message]
2019-12-04 9:36 ` [PATCH v2 09/18] qga: Fix guest-get-fsinfo error API violations 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 ` [PATCH v2 15/18] s390x/cpumodel: Fix query-cpu-definitions " Markus Armbruster
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-9-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=cminyard@mvista.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).