qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 07/17] hw/vfio/helpers: Fix missing ERRP_GUARD() for error_prepend()
Date: Thu, 29 Feb 2024 22:39:04 +0800	[thread overview]
Message-ID: <20240229143914.1977550-8-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/helpers.c, there're 3 functions passing @errp to
error_prepend() without ERRP_GUARD():
 - vfio_set_irq_signaling()
 - vfio_device_get_name()
 - vfio_device_set_fd()

As the widely used helpers, 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 their
beginning.

[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/helpers.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
index 678987080228..47b4096c05ee 100644
--- a/hw/vfio/helpers.c
+++ b/hw/vfio/helpers.c
@@ -110,6 +110,7 @@ static const char *index_to_str(VFIODevice *vbasedev, int index)
 int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex,
                            int action, int fd, Error **errp)
 {
+    ERRP_GUARD();
     struct vfio_irq_set *irq_set;
     int argsz, ret = 0;
     const char *name;
@@ -613,6 +614,7 @@ bool vfio_has_region_cap(VFIODevice *vbasedev, int region, uint16_t cap_type)
 
 int vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
 {
+    ERRP_GUARD();
     struct stat st;
 
     if (vbasedev->fd < 0) {
@@ -644,6 +646,7 @@ int vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
 
 void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp)
 {
+    ERRP_GUARD();
     int fd = monitor_fd_param(monitor_cur(), str, errp);
 
     if (fd < 0) {
-- 
2.34.1



  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 ` Zhao Liu [this message]
2024-02-29 18:22   ` [PATCH 07/17] hw/vfio/helpers: " 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 ` [PATCH 09/17] hw/vfio/pci-quirks: " Zhao Liu
2024-02-29 18:23   ` 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-8-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).