diff options
| author | Zhao Liu <zhao1.liu@intel.com> | 2024-03-11 11:38:17 +0800 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-03-12 11:45:45 +0100 |
| commit | 498696ef7646b7ae9938336f34a5a97a44dd3af7 (patch) | |
| tree | a2549f088633b951d428d07ef0e15521e044ef96 /hw/vfio | |
| parent | cf8afdfad4653ce0c96eb26d660cd86a807dbd86 (diff) | |
| download | qemu-498696ef7646b7ae9938336f34a5a97a44dd3af7.zip qemu-498696ef7646b7ae9938336f34a5a97a44dd3af7.tar.gz qemu-498696ef7646b7ae9938336f34a5a97a44dd3af7.tar.bz2 | |
hw/vfio/platform: Fix missing ERRP_GUARD() for error_prepend()
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 &error_fatal, the user
can't see this additional information, because exit() happens in
error_setg earlier than information is added [1].
The vfio_platform_realize() passes @errp to error_prepend(), and as a
DeviceClass.realize method, there are too many possible callers to check
the impact of this defect; it may or may not be harmless. Thus it is
necessary to protect @errp 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>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-ID: <20240311033822.3142585-25-zhao1.liu@linux.intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/vfio')
| -rw-r--r-- | hw/vfio/platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index a8d9b7d..dcd2365 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -576,6 +576,7 @@ static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp) */ static void vfio_platform_realize(DeviceState *dev, Error **errp) { + ERRP_GUARD(); VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev); SysBusDevice *sbdev = SYS_BUS_DEVICE(dev); VFIODevice *vbasedev = &vdev->vbasedev; |