[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/22] backends/dbus-vmstate: Fix short read error handling
From: |
Laurent Vivier |
Subject: |
[PULL 05/22] backends/dbus-vmstate: Fix short read error handling |
Date: |
Wed, 10 Mar 2021 22:44:47 +0100 |
From: Markus Armbruster <armbru@redhat.com>
When dbus_vmstate_post_load() fails, it complains to stderr. Except
on short read, where it checks with g_return_val_if_fail(). This
fails silently if G_DISABLE_CHECKS is undefined (it should be), or
else pads the short read with uninitialized bytes.
Replace g_return_val_if_fail() by a proper error check.
Fixes: 5010cec2bc87dafab39b3913c8ca91f88df9c540
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210126124240.2081959-2-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
backends/dbus-vmstate.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c
index bd050e8e9cab..2a0d2e4a31c0 100644
--- a/backends/dbus-vmstate.c
+++ b/backends/dbus-vmstate.c
@@ -229,7 +229,10 @@ static int dbus_vmstate_post_load(void *opaque, int
version_id)
&bytes_read, NULL, &err)) {
goto error;
}
- g_return_val_if_fail(bytes_read == len, -1);
+ if (bytes_read != len) {
+ error_report("%s: Short read", __func__);
+ return -1;
+ }
id[len] = 0;
trace_dbus_vmstate_loading(id);
--
2.29.2
- [PULL 00/22] Trivial branch for 6.0 patches, Laurent Vivier, 2021/03/10
- [PULL 03/22] hw/elf_ops: Fix a typo, Laurent Vivier, 2021/03/10
- [PULL 01/22] Various spelling fixes, Laurent Vivier, 2021/03/10
- [PULL 07/22] MAINTAINERS: Fix the location of tools manuals, Laurent Vivier, 2021/03/10
- [PULL 02/22] scsi: Silence gcc warning, Laurent Vivier, 2021/03/10
- [PULL 06/22] vhost_user_gpu: Drop dead check for g_malloc() failure, Laurent Vivier, 2021/03/10
- [PULL 05/22] backends/dbus-vmstate: Fix short read error handling,
Laurent Vivier <=
- [PULL 08/22] net: Use id_generate() in the network subsystem, too, Laurent Vivier, 2021/03/10
- [PULL 09/22] fuzz-test: remove unneccessary debugging flags, Laurent Vivier, 2021/03/10
- [PULL 10/22] exec/memory: Use struct Object typedef, Laurent Vivier, 2021/03/10
- [PULL 11/22] virtio-gpu: Adjust code space style, Laurent Vivier, 2021/03/10
- [PULL 04/22] target/hexagon/gen_tcg_funcs: Fix a typo, Laurent Vivier, 2021/03/10
- [PULL 12/22] ui: Replace the word 'whitelist', Laurent Vivier, 2021/03/10
- [PULL 18/22] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards, Laurent Vivier, 2021/03/10
- [PULL 14/22] seccomp: Replace the word 'blacklist', Laurent Vivier, 2021/03/10
- [PULL 13/22] scripts/tracetool: Replace the word 'whitelist', Laurent Vivier, 2021/03/10
- [PULL 17/22] qemu-common.h: Update copyright string to 2021, Laurent Vivier, 2021/03/10