[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/15] multi-process: Fix pci_proxy_dev_realize() error handling
From: |
Markus Armbruster |
Subject: |
[PULL 04/15] multi-process: Fix pci_proxy_dev_realize() error handling |
Date: |
Fri, 27 Aug 2021 06:50:33 +0200 |
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
pci_proxy_dev_realize() is wrong that way: it passes @errp to
qio_channel_new_fd() without checking for failure. If it runs into
another failure, it trips error_setv()'s assertion.
Fix it to check for failure properly.
Fixes: 9f8112073aad8e485ac012ee18809457ab7f23a6
Cc: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Cc: Jagannathan Raman <jag.raman@oracle.com>
Cc: John G Johnson <john.g.johnson@oracle.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-5-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Jagannathan Raman <jag.raman@oracle.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/remote/proxy.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index 6dda705fc2..499f540c94 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -102,10 +102,18 @@ static void pci_proxy_dev_realize(PCIDevice *device,
Error **errp)
}
dev->ioc = qio_channel_new_fd(fd, errp);
+ if (!dev->ioc) {
+ close(fd);
+ return;
+ }
error_setg(&dev->migration_blocker, "%s does not support migration",
TYPE_PCI_PROXY_DEV);
- migrate_add_blocker(dev->migration_blocker, errp);
+ if (migrate_add_blocker(dev->migration_blocker, errp) < 0) {
+ error_free(dev->migration_blocker);
+ object_unref(dev->ioc);
+ return;
+ }
qemu_mutex_init(&dev->io_mutex);
qio_channel_set_blocking(dev->ioc, true, NULL);
--
2.31.1
- [PULL 00/15] Error reporting patches for 2021-08-26, Markus Armbruster, 2021/08/27
- [PULL 06/15] i386: Never free migration blocker objects instead of sometimes, Markus Armbruster, 2021/08/27
- [PULL 03/15] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly, Markus Armbruster, 2021/08/27
- [PULL 10/15] migration: Handle migration_incoming_setup() errors consistently, Markus Armbruster, 2021/08/27
- [PULL 09/15] migration: Unify failure check for migrate_add_blocker(), Markus Armbruster, 2021/08/27
- [PULL 15/15] vl: Clean up -smp error handling, Markus Armbruster, 2021/08/27
- [PULL 02/15] spapr: Plug memory leak when we can't add a migration blocker, Markus Armbruster, 2021/08/27
- [PULL 11/15] microvm: Drop dead error handling in microvm_machine_state_init(), Markus Armbruster, 2021/08/27
- [PULL 05/15] vhost-scsi: Plug memory leak on migrate_add_blocker() failure, Markus Armbruster, 2021/08/27
- [PULL 04/15] multi-process: Fix pci_proxy_dev_realize() error handling,
Markus Armbruster <=
- [PULL 07/15] vfio: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2021/08/27
- [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker(), Markus Armbruster, 2021/08/27
- [PULL 14/15] Remove superfluous ERRP_GUARD(), Markus Armbruster, 2021/08/27
- [PULL 13/15] vhost: Clean up how VhostOpts method vhost_backend_init() fails, Markus Armbruster, 2021/08/27
- [PULL 12/15] vhost: Clean up how VhostOpts method vhost_get_config() fails, Markus Armbruster, 2021/08/27
- [PULL 01/15] error: Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2021/08/27
- Re: [PULL 00/15] Error reporting patches for 2021-08-26, Peter Maydell, 2021/08/27