From: Zhao Liu <zhao1.liu@linux.intel.com>
To: "Markus Armbruster" <armbru@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, "Zhao Liu" <zhao1.liu@intel.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PATCH 09/17] hw/vfio/pci-quirks: Fix missing ERRP_GUARD() for error_prepend()
Date: Thu, 29 Feb 2024 22:39:06 +0800 [thread overview]
Message-ID: <20240229143914.1977550-10-zhao1.liu@linux.intel.com> (raw)
In-Reply-To: <20240229143914.1977550-1-zhao1.liu@linux.intel.com>
From: Zhao Liu <zhao1.liu@intel.com>
As the comment in qapi/error, passing @errp to error_prepend() requires
ERRP_GUARD():
* = Why, when and how to use ERRP_GUARD() =
*
* Without ERRP_GUARD(), use of the @errp parameter is restricted:
...
* - It should not be passed to error_prepend(), error_vprepend() 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.
ERRP_GUARD() could avoid the case when @errp is the pointer of
error_fatal, the user can't see this additional information, because
exit() happens in error_setg earlier than information is added [1].
In hw/vfio/pci-quirks.c, there're 2 functions passing @errp to
error_prepend() without ERRP_GUARD():
- vfio_add_nv_gpudirect_cap()
- vfio_add_vmd_shadow_cap()
Their @errp parameters are so widely sourced that it is necessary to
protect them with ERRP_GUARD().
To avoid the issue like [1] said, add missing ERRP_GUARD() at the
beginning of this function.
[1]: Issue description in the commit message of commit ae7c80a7bd73
("error: New macro ERRP_GUARD()").
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: "Cédric Le Goater" <clg@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
hw/vfio/pci-quirks.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 84b1a7b9485c..496fd1ee86bd 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -1538,6 +1538,7 @@ static bool is_valid_std_cap_offset(uint8_t pos)
static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
{
+ ERRP_GUARD();
PCIDevice *pdev = &vdev->pdev;
int ret, pos;
bool c8_conflict = false, d4_conflict = false;
@@ -1630,6 +1631,7 @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
#define VMD_SHADOW_CAP_LEN 24
static int vfio_add_vmd_shadow_cap(VFIOPCIDevice *vdev, Error **errp)
{
+ ERRP_GUARD();
uint8_t membar_phys[16];
int ret, pos = 0xE8;
--
2.34.1
next prev parent reply other threads:[~2024-02-29 14:29 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-29 14:38 [PATCH 00/17 Part 2] Cleanup up to fix missing ERRP_GUARD() for error_prepend() Zhao Liu
2024-02-29 14:38 ` [PATCH 01/17] hw/misc/ivshmem: Fix " Zhao Liu
2024-02-29 17:23 ` Thomas Huth
2024-03-01 6:41 ` Zhao Liu
2024-02-29 14:38 ` [PATCH 02/17] hw/net/xen_nic: " Zhao Liu
2024-02-29 17:25 ` Thomas Huth
2024-03-08 15:26 ` Anthony PERARD
2024-02-29 14:39 ` [PATCH 03/17] hw/remote/remote-obj: hw/misc/ivshmem: " Zhao Liu
2024-02-29 17:26 ` Thomas Huth
2024-02-29 14:39 ` [PATCH 04/17] hw/scsi/vhost-scsi: " Zhao Liu
2024-02-29 17:22 ` Thomas Huth
2024-03-01 6:42 ` Zhao Liu
2024-02-29 14:39 ` [PATCH 05/17] hw/vfio/ap: " Zhao Liu
2024-02-29 17:30 ` Thomas Huth
2024-03-04 15:12 ` Anthony Krowiak
2024-03-07 19:25 ` Thomas Huth
2024-03-08 11:39 ` Zhao Liu
2024-02-29 14:39 ` [PATCH 06/17] hw/vfio/container: " Zhao Liu
2024-02-29 17:28 ` Thomas Huth
2024-02-29 18:21 ` Cédric Le Goater
2024-02-29 14:39 ` [PATCH 07/17] hw/vfio/helpers: " Zhao Liu
2024-02-29 18:22 ` Cédric Le Goater
2024-02-29 14:39 ` [PATCH 08/17] hw/vfio/iommufd: " Zhao Liu
2024-02-29 18:23 ` Cédric Le Goater
2024-02-29 14:39 ` Zhao Liu [this message]
2024-02-29 18:23 ` [PATCH 09/17] hw/vfio/pci-quirks: " Cédric Le Goater
2024-02-29 14:39 ` [PATCH 10/17] hw/vfio/pci: " Zhao Liu
2024-02-29 18:25 ` Cédric Le Goater
2024-02-29 14:39 ` [PATCH 11/17] hw/vfio/platform: " Zhao Liu
2024-02-29 18:25 ` Cédric Le Goater
2024-02-29 14:39 ` [PATCH 12/17] hw/virtio/vhost-vsock: " Zhao Liu
2024-02-29 14:39 ` [PATCH 13/17] hw/virtio/vhost: " Zhao Liu
2024-02-29 14:39 ` [PATCH 14/17] migration/option: " Zhao Liu
2024-02-29 14:39 ` Fabiano Rosas
2024-03-01 1:37 ` Peter Xu
2024-02-29 14:39 ` [PATCH 15/17] net/vhost-vdpa: " Zhao Liu
2024-02-29 17:33 ` Thomas Huth
2024-02-29 14:39 ` [PATCH 16/17] target/i386/sev: " Zhao Liu
2024-02-29 17:36 ` Thomas Huth
2024-02-29 14:39 ` [PATCH 17/17] target/s390x/cpu_models: " Zhao Liu
2024-02-29 17:17 ` Thomas Huth
2024-03-01 6:46 ` Zhao Liu
2024-03-08 10:12 ` Zhao Liu
2024-03-08 10:08 ` Thomas Huth
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=20240229143914.1977550-10-zhao1.liu@linux.intel.com \
--to=zhao1.liu@linux.intel.com \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=clg@redhat.com \
--cc=michael.roth@amd.com \
--cc=mjt@tls.msk.ru \
--cc=philmd@linaro.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).