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>,
"Marc-André Lureau" <marcandre.lureau@gmail.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH v2 4/4] block/export: avoid g_return_val_if() input validation
Date: Wed, 2 Dec 2020 15:26:11 +0000 [thread overview]
Message-ID: <20201202152611.677753-5-stefanha@redhat.com> (raw)
In-Reply-To: <20201202152611.677753-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>
---
block/export/vhost-user-blk-server.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c
index 62672d1cb9..bccbc98d57 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -267,7 +267,11 @@ vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint32_t len)
VuServer *server = container_of(vu_dev, VuServer, vu_dev);
VuBlkExport *vexp = container_of(server, VuBlkExport, vu_server);
- g_return_val_if_fail(len <= sizeof(struct virtio_blk_config), -1);
+ if (len > sizeof(struct virtio_blk_config)) {
+ error_report("Invalid get_config len %u, expected <= %zu",
+ len, sizeof(struct virtio_blk_config));
+ return -1;
+ }
memcpy(config, &vexp->blkcfg, len);
return 0;
--
2.28.0
next prev parent reply other threads:[~2020-12-02 15:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 15:26 [PATCH v2 0/4] vhost-user: avoid g_return_val_if() in get/set_config() Stefan Hajnoczi
2020-12-02 15:26 ` [PATCH v2 1/4] contrib/vhost-user-blk: avoid g_return_val_if() input validation Stefan Hajnoczi
2020-12-02 15:49 ` Marc-André Lureau
2020-12-02 15:54 ` Raphael Norwitz
2020-12-02 15:55 ` Philippe Mathieu-Daudé
2020-12-02 15:26 ` [PATCH v2 2/4] contrib/vhost-user-gpu: " Stefan Hajnoczi
2020-12-02 15:50 ` Marc-André Lureau
2020-12-03 9:51 ` Stefan Hajnoczi
2020-12-03 10:26 ` Marc-André Lureau
2020-12-03 11:37 ` Stefan Hajnoczi
2020-12-02 15:26 ` [PATCH v2 3/4] contrib/vhost-user-input: " Stefan Hajnoczi
2020-12-02 15:51 ` Marc-André Lureau
2020-12-03 9:52 ` Stefan Hajnoczi
2020-12-02 15:26 ` Stefan Hajnoczi [this message]
2020-12-02 15:52 ` [PATCH v2 4/4] block/export: " Marc-André Lureau
2020-12-02 15:58 ` Philippe Mathieu-Daudé
2020-12-03 13:41 ` [PATCH v2 0/4] vhost-user: avoid g_return_val_if() in get/set_config() Stefano Garzarella
2020-12-10 8:29 ` Marc-André Lureau
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=20201202152611.677753-5-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@gmail.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 \
--cc=sgarzare@redhat.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).