From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Corey Minyard <cminyard@mvista.com>
Subject: [PULL 09/34] hw/ipmi: Fix realize() error API violations
Date: Tue, 17 Dec 2019 07:26:26 +0100 [thread overview]
Message-ID: <20191217062651.9687-10-armbru@redhat.com> (raw)
In-Reply-To: <20191217062651.9687-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>
Message-Id: <20191204093625.14836-9-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-17 6:38 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 6:26 [PULL 00/34] Error reporting patches for 2019-12-16 Markus Armbruster
2019-12-17 6:26 ` [PULL 01/34] error: Fix -msg timestamp default Markus Armbruster
2019-12-17 6:26 ` [PULL 02/34] crypto: Fix certificate file error handling crash bug Markus Armbruster
2019-12-17 6:26 ` [PULL 03/34] crypto: Fix typo in QCryptoTLSSession's <example> comment Markus Armbruster
2019-12-17 6:26 ` [PULL 04/34] io: Fix Error usage in a comment <example> Markus Armbruster
2019-12-17 6:26 ` [PULL 05/34] tests: Clean up initialization of Error *err variables Markus Armbruster
2019-12-17 6:26 ` [PULL 06/34] exec: Fix file_ram_alloc() error API violations Markus Armbruster
2019-12-17 6:26 ` [PULL 07/34] hw/acpi: Fix legacy CPU plug " Markus Armbruster
2019-12-17 6:26 ` [PULL 08/34] hw/core: Fix fit_load_fdt() " Markus Armbruster
2019-12-17 6:26 ` Markus Armbruster [this message]
2019-12-17 6:26 ` [PULL 10/34] qga: Fix guest-get-fsinfo " Markus Armbruster
2019-12-17 6:26 ` [PULL 11/34] memory-device: Fix memory pre-plug " Markus Armbruster
2019-12-17 6:26 ` [PULL 12/34] error: Clean up unusual names of Error * variables Markus Armbruster
2019-12-17 6:26 ` [PULL 13/34] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize() Markus Armbruster
2019-12-17 6:26 ` [PULL 14/34] tests-blockjob: Use error_free_or_abort() Markus Armbruster
2019-12-17 6:26 ` [PULL 15/34] net/net: Clean up variable shadowing in net_client_init() Markus Armbruster
2019-12-17 6:26 ` [PULL 16/34] error: make Error **errp const where it is appropriate Markus Armbruster
2019-12-17 6:26 ` [PULL 17/34] hmp: drop Error pointer indirection in hmp_handle_error Markus Armbruster
2019-12-17 6:26 ` [PULL 18/34] vnc: drop Error pointer indirection in vnc_client_io_error Markus Armbruster
2019-12-17 6:26 ` [PULL 19/34] qdev-monitor: make Error **errp const where it is appropriate Markus Armbruster
2019-12-17 6:26 ` [PULL 20/34] ppc: " Markus Armbruster
2019-12-17 6:26 ` [PULL 21/34] 9pfs: " Markus Armbruster
2019-12-17 6:26 ` [PULL 22/34] hw/core/qdev: cleanup Error ** variables Markus Armbruster
2019-12-17 6:26 ` [PULL 23/34] block/snapshot: rename Error ** parameter to more common errp Markus Armbruster
2019-12-17 6:26 ` [PULL 24/34] hw/i386/amd_iommu: " Markus Armbruster
2019-12-17 6:26 ` [PULL 25/34] qga: " Markus Armbruster
2019-12-17 6:26 ` [PULL 26/34] monitor/qmp-cmds: " Markus Armbruster
2019-12-17 6:26 ` [PULL 27/34] hw/s390x: " Markus Armbruster
2019-12-17 6:26 ` [PULL 28/34] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header Markus Armbruster
2019-12-17 6:26 ` [PULL 29/34] hw/tpm: rename Error ** parameter to more common errp Markus Armbruster
2019-12-17 6:26 ` [PULL 30/34] hw/usb: " Markus Armbruster
2019-12-17 6:26 ` [PULL 31/34] include/qom/object.h: " Markus Armbruster
2019-12-17 6:26 ` [PULL 32/34] backends/cryptodev: drop local_err from cryptodev_backend_complete() Markus Armbruster
2019-12-17 6:26 ` [PULL 33/34] hw/vfio/ap: drop local_err from vfio_ap_realize Markus Armbruster
2019-12-17 6:26 ` [PULL 34/34] nbd: assert that Error** is not NULL in nbd_iter_channel_error Markus Armbruster
2019-12-17 13:09 ` Eric Blake
2019-12-18 7:31 ` Markus Armbruster
2019-12-18 8:46 ` Markus Armbruster
2019-12-17 15:49 ` [PULL 00/34] Error reporting patches for 2019-12-16 Peter Maydell
2019-12-18 7:35 ` Markus Armbruster
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=20191217062651.9687-10-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).