* [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse
@ 2021-01-26 12:42 Markus Armbruster
2021-01-26 12:42 ` [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling Markus Armbruster
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Markus Armbruster @ 2021-01-26 12:42 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau, kraxel, mst
Markus Armbruster (2):
backends/dbus-vmstate: Fix short read error handling
vhost_user_gpu: Drop dead check for g_malloc() failure
backends/dbus-vmstate.c | 5 ++++-
hw/display/vhost-user-gpu.c | 1 -
2 files changed, 4 insertions(+), 2 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling
2021-01-26 12:42 [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse Markus Armbruster
@ 2021-01-26 12:42 ` Markus Armbruster
2021-01-26 13:09 ` Marc-André Lureau
2021-03-09 20:41 ` Laurent Vivier
2021-01-26 12:42 ` [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure Markus Armbruster
2021-02-19 9:16 ` [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse Markus Armbruster
2 siblings, 2 replies; 9+ messages in thread
From: Markus Armbruster @ 2021-01-26 12:42 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau, kraxel, mst
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>
---
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 bd050e8e9c..2a0d2e4a31 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.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure
2021-01-26 12:42 [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse Markus Armbruster
2021-01-26 12:42 ` [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling Markus Armbruster
@ 2021-01-26 12:42 ` Markus Armbruster
2021-01-26 13:09 ` Marc-André Lureau
` (2 more replies)
2021-02-19 9:16 ` [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse Markus Armbruster
2 siblings, 3 replies; 9+ messages in thread
From: Markus Armbruster @ 2021-01-26 12:42 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau, kraxel, mst
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/display/vhost-user-gpu.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 51f1747c4a..db042c7c5e 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
}
msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
- g_return_if_fail(msg != NULL);
r = qemu_chr_fe_read_all(&g->vhost_chr,
(uint8_t *)&msg->payload, size);
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling
2021-01-26 12:42 ` [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling Markus Armbruster
@ 2021-01-26 13:09 ` Marc-André Lureau
2021-03-09 20:41 ` Laurent Vivier
1 sibling, 0 replies; 9+ messages in thread
From: Marc-André Lureau @ 2021-01-26 13:09 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Michael S. Tsirkin, QEMU, Gerd Hoffmann
On Tue, Jan 26, 2021 at 4:43 PM Markus Armbruster <armbru@redhat.com> wrote:
>
> 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>
thanks
> ---
> 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 bd050e8e9c..2a0d2e4a31 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.26.2
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure
2021-01-26 12:42 ` [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure Markus Armbruster
@ 2021-01-26 13:09 ` Marc-André Lureau
2021-01-26 14:10 ` Michael S. Tsirkin
2021-03-09 20:42 ` Laurent Vivier
2 siblings, 0 replies; 9+ messages in thread
From: Marc-André Lureau @ 2021-01-26 13:09 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Michael S. Tsirkin, QEMU, Gerd Hoffmann
On Tue, Jan 26, 2021 at 4:47 PM Markus Armbruster <armbru@redhat.com> wrote:
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
thanks
> ---
> hw/display/vhost-user-gpu.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
> index 51f1747c4a..db042c7c5e 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
> }
>
> msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
> - g_return_if_fail(msg != NULL);
>
> r = qemu_chr_fe_read_all(&g->vhost_chr,
> (uint8_t *)&msg->payload, size);
> --
> 2.26.2
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure
2021-01-26 12:42 ` [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure Markus Armbruster
2021-01-26 13:09 ` Marc-André Lureau
@ 2021-01-26 14:10 ` Michael S. Tsirkin
2021-03-09 20:42 ` Laurent Vivier
2 siblings, 0 replies; 9+ messages in thread
From: Michael S. Tsirkin @ 2021-01-26 14:10 UTC (permalink / raw)
To: Markus Armbruster; +Cc: marcandre.lureau, qemu-devel, kraxel
On Tue, Jan 26, 2021 at 01:42:40PM +0100, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/display/vhost-user-gpu.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
> index 51f1747c4a..db042c7c5e 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
> }
>
> msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
> - g_return_if_fail(msg != NULL);
>
> r = qemu_chr_fe_read_all(&g->vhost_chr,
> (uint8_t *)&msg->payload, size);
> --
> 2.26.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse
2021-01-26 12:42 [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse Markus Armbruster
2021-01-26 12:42 ` [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling Markus Armbruster
2021-01-26 12:42 ` [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure Markus Armbruster
@ 2021-02-19 9:16 ` Markus Armbruster
2 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2021-02-19 9:16 UTC (permalink / raw)
To: qemu-trivial; +Cc: marcandre.lureau, kraxel, qemu-devel, mst
I think this could go via qemu-trivial.
Markus Armbruster <armbru@redhat.com> writes:
> Markus Armbruster (2):
> backends/dbus-vmstate: Fix short read error handling
> vhost_user_gpu: Drop dead check for g_malloc() failure
>
> backends/dbus-vmstate.c | 5 ++++-
> hw/display/vhost-user-gpu.c | 1 -
> 2 files changed, 4 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling
2021-01-26 12:42 ` [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling Markus Armbruster
2021-01-26 13:09 ` Marc-André Lureau
@ 2021-03-09 20:41 ` Laurent Vivier
1 sibling, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2021-03-09 20:41 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: qemu-trivial, marcandre.lureau, kraxel, mst
Le 26/01/2021 à 13:42, Markus Armbruster a écrit :
> 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>
> ---
> 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 bd050e8e9c..2a0d2e4a31 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);
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure
2021-01-26 12:42 ` [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure Markus Armbruster
2021-01-26 13:09 ` Marc-André Lureau
2021-01-26 14:10 ` Michael S. Tsirkin
@ 2021-03-09 20:42 ` Laurent Vivier
2 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2021-03-09 20:42 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: qemu-trivial, marcandre.lureau, kraxel, mst
Le 26/01/2021 à 13:42, Markus Armbruster a écrit :
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> hw/display/vhost-user-gpu.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
> index 51f1747c4a..db042c7c5e 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -332,7 +332,6 @@ vhost_user_gpu_chr_read(void *opaque)
> }
>
> msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size);
> - g_return_if_fail(msg != NULL);
>
> r = qemu_chr_fe_read_all(&g->vhost_chr,
> (uint8_t *)&msg->payload, size);
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-03-09 21:11 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-26 12:42 [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse Markus Armbruster
2021-01-26 12:42 ` [PATCH 1/2] backends/dbus-vmstate: Fix short read error handling Markus Armbruster
2021-01-26 13:09 ` Marc-André Lureau
2021-03-09 20:41 ` Laurent Vivier
2021-01-26 12:42 ` [PATCH 2/2] vhost_user_gpu: Drop dead check for g_malloc() failure Markus Armbruster
2021-01-26 13:09 ` Marc-André Lureau
2021-01-26 14:10 ` Michael S. Tsirkin
2021-03-09 20:42 ` Laurent Vivier
2021-02-19 9:16 ` [PATCH 0/2] g_return_if_fail(), g_return_val_if_fail() misuse Markus Armbruster
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).