[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/55] migration/option: Fix missing ERRP_GUARD() for error_prepen
From: |
Thomas Huth |
Subject: |
[PULL 30/55] migration/option: Fix missing ERRP_GUARD() for error_prepend() |
Date: |
Tue, 12 Mar 2024 13:43:14 +0100 |
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 &error_fatal, the user
can't see this additional information, because exit() happens in
error_setg earlier than information is added [1].
The migrate_params_check() passes @errp to error_prepend() without
ERRP_GUARD(), and it could be called from migration_object_init(),
where the passed @errp points to @error_fatal.
Therefore, the error message echoed in error_prepend() will be lost
because of the above issue.
To fix this, 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: Peter Xu <peterx@redhat.com>
Cc: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Acked-by: Peter Xu <peterx@redhat.com>
Message-ID: <20240311033822.3142585-28-zhao1.liu@linux.intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
migration/options.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/migration/options.c b/migration/options.c
index 40eb930940..caff0a271d 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -1085,6 +1085,8 @@ void migrate_params_init(MigrationParameters *params)
*/
bool migrate_params_check(MigrationParameters *params, Error **errp)
{
+ ERRP_GUARD();
+
if (params->has_compress_level &&
(params->compress_level > 9)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
--
2.44.0
- [PULL 19/55] block/virtio-blk: Fix missing ERRP_GUARD() for error_prepend(), (continued)
- [PULL 19/55] block/virtio-blk: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 23/55] hw/vfio/helpers: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 21/55] hw/vfio/ap: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 25/55] hw/vfio/pci-quirks: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 24/55] hw/vfio/iommufd: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 26/55] hw/vfio/pci: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 27/55] hw/vfio/platform: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 31/55] net/vhost-vdpa: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 28/55] hw/virtio/vhost-vsock: Fix missing ERRP_GUARD() for error_prepend(), Thomas Huth, 2024/03/12
- [PULL 41/55] target/hexagon: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12
- [PULL 30/55] migration/option: Fix missing ERRP_GUARD() for error_prepend(),
Thomas Huth <=
- [PULL 46/55] target/mips: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12
- [PULL 36/55] bulk: Call in place single use cpu_env(), Thomas Huth, 2024/03/12
- [PULL 43/55] target/loongarch: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12
- [PULL 35/55] hw/core: Declare CPUArchId::cpu as CPUState instead of Object, Thomas Huth, 2024/03/12
- [PULL 38/55] target/alpha: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12
- [PULL 34/55] bulk: Access existing variables initialized to &S->F when available, Thomas Huth, 2024/03/12
- [PULL 45/55] target/microblaze: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12
- [PULL 47/55] target/nios2: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12
- [PULL 39/55] target/avr: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12
- [PULL 51/55] target/sh4: Prefer fast cpu_env() over slower CPU QOM cast macro, Thomas Huth, 2024/03/12