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>
Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org,
qemu-trivial@nongnu.org, Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH 5/6] hw/pci-bridge/cxl_upstream: Fix missing ERRP_GUARD() in cxl_usp_realize()
Date: Wed, 21 Feb 2024 17:43:16 +0800 [thread overview]
Message-ID: <20240221094317.994454-6-zhao1.liu@linux.intel.com> (raw)
In-Reply-To: <20240221094317.994454-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.
* - It should not be passed to error_prepend() or
* error_append_hint(), because that doesn't work with &error_fatal.
* 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.
Currently, since cxl_usp_realize() - as a PCIDeviceClass.realize()
method - doesn't get the NULL errp parameter, it doesn't trigger the
dereference issue.
To follow the requirement of errp, add missing ERRP_GUARD() in
cxl_usp_realize()().
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
Suggested by credit:
Markus: Referred his explanation about ERRP_GUARD().
---
hw/pci-bridge/cxl_upstream.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c
index e87eb4017713..03d123cca0ef 100644
--- a/hw/pci-bridge/cxl_upstream.c
+++ b/hw/pci-bridge/cxl_upstream.c
@@ -289,6 +289,7 @@ static void free_default_cdat_table(CDATSubHeader **cdat_table, int num,
static void cxl_usp_realize(PCIDevice *d, Error **errp)
{
+ ERRP_GUARD();
PCIEPort *p = PCIE_PORT(d);
CXLUpstreamPort *usp = CXL_USP(d);
CXLComponentState *cxl_cstate = &usp->cxl_cstate;
--
2.34.1
next prev parent reply other threads:[~2024-02-21 15:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 9:43 [PATCH 0/6] [PATCH 0/6] Fix missing ERRP_GUARD() when dereference @errp Zhao Liu
2024-02-21 9:43 ` [PATCH 1/6] hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() Zhao Liu
2024-02-21 11:31 ` Markus Armbruster
2024-02-21 15:04 ` Zhao Liu
2024-02-26 15:52 ` Jonathan Cameron via
2024-02-21 9:43 ` [PATCH 2/6] hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() Zhao Liu
2024-02-21 11:32 ` Markus Armbruster
2024-02-21 15:05 ` Zhao Liu
2024-02-21 9:43 ` [PATCH 3/6] hw/mem/cxl_type3: Fix missing ERRP_GUARD() in ct3_realize() Zhao Liu
2024-02-21 11:35 ` Markus Armbruster
2024-02-21 15:11 ` Zhao Liu
2024-02-26 15:53 ` Jonathan Cameron via
2024-02-21 9:43 ` [PATCH 4/6] hw/misc/xlnx-versal-trng: Fix missing ERRP_GUARD() in trng_prop_fault_event_set() Zhao Liu
2024-02-21 11:47 ` Markus Armbruster
2024-02-21 15:06 ` Zhao Liu
2024-02-21 9:43 ` Zhao Liu [this message]
2024-02-21 11:49 ` [PATCH 5/6] hw/pci-bridge/cxl_upstream: Fix missing ERRP_GUARD() in cxl_usp_realize() Markus Armbruster
2024-02-21 15:09 ` Zhao Liu
2024-02-26 15:54 ` Jonathan Cameron via
2024-02-21 9:43 ` [PATCH 6/6] hw/vfio/iommufd: Fix missing ERRP_GUARD() in iommufd_cdev_getfd() Zhao Liu
2024-02-21 11:53 ` Markus Armbruster
2024-02-21 15:12 ` Zhao Liu
2024-02-22 6:04 ` [PATCH 0/6] [PATCH 0/6] Fix missing ERRP_GUARD() when dereference @errp Michael Tokarev
2024-02-22 7:29 ` Zhao Liu
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=20240221094317.994454-6-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=mst@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).