From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Michael Roth" <mdroth@linux.vnet.ibm.com>
Subject: [PULL 24/32] qga: Fix qmp_guest_suspend_{disk, ram}() error handling
Date: Wed, 29 Apr 2020 09:20:40 +0200 [thread overview]
Message-ID: <20200429072048.29963-25-armbru@redhat.com> (raw)
In-Reply-To: <20200429072048.29963-1-armbru@redhat.com>
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
qmp_guest_suspend_disk() and qmp_guest_suspend_ram() pass @local_err
first to check_suspend_mode(), then to acquire_privilege(), then to
execute_async(). Continuing after errors here can only end in tears.
For instance, we risk tripping error_setv()'s assertion.
Fixes: aa59637ea1c6a4c83430933f9c44c43e6c3f1b69
Fixes: f54603b6aa765514b2519e74114a2f417759d727
Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200422130719.28225-15-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
qga/commands-win32.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 9717a8d52d..5ba56327dd 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1322,9 +1322,16 @@ void qmp_guest_suspend_disk(Error **errp)
*mode = GUEST_SUSPEND_MODE_DISK;
check_suspend_mode(*mode, &local_err);
+ if (local_err) {
+ goto out;
+ }
acquire_privilege(SE_SHUTDOWN_NAME, &local_err);
+ if (local_err) {
+ goto out;
+ }
execute_async(do_suspend, mode, &local_err);
+out:
if (local_err) {
error_propagate(errp, local_err);
g_free(mode);
@@ -1338,9 +1345,16 @@ void qmp_guest_suspend_ram(Error **errp)
*mode = GUEST_SUSPEND_MODE_RAM;
check_suspend_mode(*mode, &local_err);
+ if (local_err) {
+ goto out;
+ }
acquire_privilege(SE_SHUTDOWN_NAME, &local_err);
+ if (local_err) {
+ goto out;
+ }
execute_async(do_suspend, mode, &local_err);
+out:
if (local_err) {
error_propagate(errp, local_err);
g_free(mode);
--
2.21.1
next prev parent reply other threads:[~2020-04-29 7:24 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 7:20 [PULL 00/32] Miscellaneous patches for 2020-04-29 Markus Armbruster
2020-04-29 7:20 ` [PULL 01/32] various: Remove suspicious '\' character outside of #define in C code Markus Armbruster
2020-04-29 7:20 ` [PULL 02/32] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt() Markus Armbruster
2020-04-29 7:20 ` [PULL 03/32] qemu-options: Factor out get_opt_name_value() helper Markus Armbruster
2020-04-29 7:20 ` [PULL 04/32] qemu-option: Fix sloppy recognition of "id=..." after ", , " Markus Armbruster
2020-04-29 7:20 ` [PULL 05/32] qemu-option: Fix has_help_option()'s sloppy parsing Markus Armbruster
2020-04-29 7:20 ` [PULL 06/32] test-qemu-opts: Simplify test_has_help_option() after bug fix Markus Armbruster
2020-04-29 7:20 ` [PULL 07/32] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily() Markus Armbruster
2020-04-29 7:20 ` [PULL 08/32] qemu-img: Factor out accumulate_options() helper Markus Armbruster
2020-04-29 7:20 ` [PULL 09/32] qemu-img: Move is_valid_option_list() to qemu-img.c and rewrite Markus Armbruster
2020-04-29 7:20 ` [PULL 10/32] qemu-img: Reject broken -o "" Markus Armbruster
2020-04-29 7:20 ` [PULL 11/32] cryptodev: Fix cryptodev_builtin_cleanup() error API violation Markus Armbruster
2020-04-29 7:20 ` [PULL 12/32] block/file-posix: Fix check_cache_dropped() error handling Markus Armbruster
2020-04-29 9:22 ` Stefan Hajnoczi
2020-04-29 7:20 ` [PULL 13/32] cpus: Fix configure_icount() error API violation Markus Armbruster
2020-05-07 15:57 ` Peter Maydell
2020-05-08 6:58 ` Markus Armbruster
2020-04-29 7:20 ` [PULL 14/32] cpus: Proper range-checking for -icount shift=N Markus Armbruster
2020-04-29 7:20 ` [PULL 15/32] arm/virt: Fix virt_machine_device_plug_cb() error API violation Markus Armbruster
2020-04-29 7:20 ` [PULL 16/32] fdc: Fix fallback=auto error handling Markus Armbruster
2020-04-29 7:20 ` [PULL 17/32] bochs-display: Fix vgamem=SIZE " Markus Armbruster
2020-04-29 7:20 ` [PULL 18/32] virtio-net: Fix duplex=... and speed=... " Markus Armbruster
2020-04-29 7:20 ` [PULL 19/32] xen/pt: Fix flawed conversion to realize() Markus Armbruster
2020-04-29 7:20 ` [PULL 20/32] io: Fix qio_channel_socket_close() error handling Markus Armbruster
2020-04-29 7:20 ` [PULL 21/32] migration/colo: Fix qmp_xen_colo_do_checkpoint() " Markus Armbruster
2020-04-29 7:20 ` [PULL 22/32] tests/test-logging: Fix test for -dfilter 0..0xffffffffffffffff Markus Armbruster
2020-04-29 7:20 ` [PULL 23/32] qga: Fix qmp_guest_get_memory_blocks() error handling Markus Armbruster
2020-04-29 7:20 ` Markus Armbruster [this message]
2020-04-29 7:20 ` [PULL 25/32] sam460ex: Suppress useless warning on -m 32 and -m 64 Markus Armbruster
2020-04-29 7:20 ` [PULL 26/32] smbus: Fix spd_data_generate() error API violation Markus Armbruster
2020-04-29 7:20 ` [PULL 27/32] bamboo, sam460ex: Tidy up error message for unsupported RAM size Markus Armbruster
2020-04-29 7:20 ` [PULL 28/32] smbus: Fix spd_data_generate() for number of banks > 2 Markus Armbruster
2020-04-29 7:20 ` [PULL 29/32] Makefile: Drop unused, broken target recurse-fuzz Markus Armbruster
2020-04-29 7:20 ` [PULL 30/32] fuzz: Simplify how we compute available machines and types Markus Armbruster
2020-04-29 7:20 ` [PULL 31/32] libqos: Give get_machine_allocator() internal linkage Markus Armbruster
2020-04-29 7:20 ` [PULL 32/32] qemu-option: pass NULL rather than 0 to the id of qemu_opts_set() Markus Armbruster
2020-04-29 8:54 ` [PULL 00/32] Miscellaneous patches for 2020-04-29 no-reply
2020-04-29 19:59 ` Peter Maydell
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=20200429072048.29963-25-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).