From: Zhao Liu <zhao1.liu@linux.intel.com>
To: "Jonathan Cameron" <jonathan.cameron@huawei.com>,
"Fan Ni" <fan.ni@samsung.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Alistair Francis" <alistair@alistair23.me>,
"Edgar E . Iglesias" <edgar.iglesias@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael Tokarev" <mjt@tls.msk.ru>
Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org,
qemu-trivial@nongnu.org, Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH v2 3/7] hw/mem/cxl_type3: Fix missing ERRP_GUARD() in ct3_realize()
Date: Fri, 23 Feb 2024 16:56:49 +0800 [thread overview]
Message-ID: <20240223085653.1255438-4-zhao1.liu@linux.intel.com> (raw)
In-Reply-To: <20240223085653.1255438-1-zhao1.liu@linux.intel.com>
From: Zhao Liu <zhao1.liu@intel.com>
As the comment in qapi/error, dereferencing @errp requires
ERRP_GUARD():
* = Why, when and how to use ERRP_GUARD() =
*
* Without ERRP_GUARD(), use of the @errp parameter is restricted:
* - It must not be dereferenced, because it may be null.
...
* ERRP_GUARD() lifts these restrictions.
*
* To use ERRP_GUARD(), add it right at the beginning of the function.
* @errp can then be used without worrying about the argument being
* NULL or &error_fatal.
*
* Using it when it's not needed is safe, but please avoid cluttering
* the source with useless code.
But in ct3_realize(), @errp is dereferenced without ERRP_GUARD():
cxl_doe_cdat_init(cxl_cstate, errp);
if (*errp) {
goto err_free_special_ops;
}
Here we check *errp, because cxl_doe_cdat_init() returns void. And
ct3_realize() - as a PCIDeviceClass.realize() method - doesn't get the
NULL @errp parameter, it hasn't triggered the bug that dereferencing
the NULL @errp.
To follow the requirement of @errp, add missing ERRP_GUARD() in
ct3_realize().
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
Suggested by credit:
Markus: Referred his explanation about ERRP_GUARD().
---
v2:
* Add the @errp dereference code in commit message to make review
easier. (Markus)
---
hw/mem/cxl_type3.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
index e8801805b90f..a3b0761f843b 100644
--- a/hw/mem/cxl_type3.c
+++ b/hw/mem/cxl_type3.c
@@ -645,6 +645,7 @@ static DOEProtocol doe_cdat_prot[] = {
static void ct3_realize(PCIDevice *pci_dev, Error **errp)
{
+ ERRP_GUARD();
CXLType3Dev *ct3d = CXL_TYPE3(pci_dev);
CXLComponentState *cxl_cstate = &ct3d->cxl_cstate;
ComponentRegisters *regs = &cxl_cstate->crb;
--
2.34.1
next prev parent reply other threads:[~2024-02-23 8:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-23 8:56 [PATCH v2 0/7] Cleanup and fix @errp dereference Zhao Liu
2024-02-23 8:56 ` [PATCH v2 1/7] hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() Zhao Liu
2024-02-26 16:07 ` Jonathan Cameron via
2024-02-28 7:30 ` Markus Armbruster
2024-02-28 16:09 ` Zhao Liu
2024-02-23 8:56 ` [PATCH v2 2/7] hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() Zhao Liu
2024-02-23 8:56 ` Zhao Liu [this message]
2024-02-26 16:07 ` [PATCH v2 3/7] hw/mem/cxl_type3: Fix missing ERRP_GUARD() in ct3_realize() Jonathan Cameron via
2024-02-23 8:56 ` [PATCH v2 4/7] hw/misc/xlnx-versal-trng: Check returned bool in trng_prop_fault_event_set() Zhao Liu
2024-02-23 17:53 ` Philippe Mathieu-Daudé
2024-02-23 8:56 ` [PATCH v2 5/7] hw/pci-bridge/cxl_upstream: Fix missing ERRP_GUARD() in cxl_usp_realize() Zhao Liu
2024-02-26 16:07 ` Jonathan Cameron via
2024-03-12 10:39 ` Thomas Huth
2024-02-23 8:56 ` [PATCH v2 6/7] hw/vfio/iommufd: Fix missing ERRP_GUARD() in iommufd_cdev_getfd() Zhao Liu
2024-02-23 8:56 ` [PATCH v2 7/7] hw/intc: Check @errp to handle the error of IOAPICCommonClass.realize() Zhao Liu
2024-02-23 17:52 ` Philippe Mathieu-Daudé
2024-03-11 3:51 ` [PATCH v2 0/7] Cleanup and fix @errp dereference Zhao Liu
2024-03-12 16:43 ` Michael S. Tsirkin
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=20240223085653.1255438-4-zhao1.liu@linux.intel.com \
--to=zhao1.liu@linux.intel.com \
--cc=alex.williamson@redhat.com \
--cc=alistair@alistair23.me \
--cc=armbru@redhat.com \
--cc=clg@redhat.com \
--cc=edgar.iglesias@gmail.com \
--cc=fan.ni@samsung.com \
--cc=jonathan.cameron@huawei.com \
--cc=laurent@vivier.eu \
--cc=marcel.apfelbaum@gmail.com \
--cc=mjt@tls.msk.ru \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=zhao1.liu@intel.com \
/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).