From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Coiby Xu" <Coiby.Xu@gmail.com>,
"Raphael Norwitz" <raphael.norwitz@nutanix.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Max Reitz" <mreitz@redhat.com>
Subject: [PATCH 2/4] contrib/vhost-user-gpu: avoid g_return_val_if() input validation
Date: Wed, 18 Nov 2020 09:16:42 +0000 [thread overview]
Message-ID: <20201118091644.199527-3-stefanha@redhat.com> (raw)
In-Reply-To: <20201118091644.199527-1-stefanha@redhat.com>
Do not validate input with g_return_val_if(). This API is intended for
checking programming errors and is compiled out with -DG_DISABLE_CHECKS.
Use an explicit if statement for input validation so it cannot
accidentally be compiled out.
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
contrib/vhost-user-gpu/vhost-user-gpu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-gpu/vhost-user-gpu.c
index a019d0a9ac..f445ef28ec 100644
--- a/contrib/vhost-user-gpu/vhost-user-gpu.c
+++ b/contrib/vhost-user-gpu/vhost-user-gpu.c
@@ -1044,7 +1044,9 @@ vg_get_config(VuDev *dev, uint8_t *config, uint32_t len)
{
VuGpu *g = container_of(dev, VuGpu, dev.parent);
- g_return_val_if_fail(len <= sizeof(struct virtio_gpu_config), -1);
+ if (len > sizeof(struct virtio_gpu_config)) {
+ return -1;
+ }
if (opt_virgl) {
g->virtio_config.num_capsets = vg_virgl_get_num_capsets();
--
2.28.0
next prev parent reply other threads:[~2020-11-18 9:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 9:16 [PATCH 0/4] vhost-user: avoid g_return_val_if() in get/set_config() Stefan Hajnoczi
2020-11-18 9:16 ` [PATCH 1/4] contrib/vhost-user-blk: avoid g_return_val_if() input validation Stefan Hajnoczi
2020-11-18 9:16 ` Stefan Hajnoczi [this message]
2020-11-18 9:16 ` [PATCH 3/4] contrib/vhost-user-input: " Stefan Hajnoczi
2020-11-18 9:16 ` [PATCH 4/4] block/export: " Stefan Hajnoczi
2020-11-18 15:21 ` [PATCH 0/4] vhost-user: avoid g_return_val_if() in get/set_config() Marc-André Lureau
2020-11-18 16:27 ` Markus Armbruster
2020-12-02 15:09 ` Stefan Hajnoczi
2020-11-18 16:28 ` Markus Armbruster
2020-11-23 11:20 ` Stefano Garzarella
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=20201118091644.199527-3-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
/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).