aboutsummaryrefslogtreecommitdiff
path: root/block/export
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2020-11-18 09:16:44 +0000
committerMichael S. Tsirkin <mst@redhat.com>2020-12-09 13:04:17 -0500
commit552c2c4c101335e67ac8ae8ab022d88a8795f2ac (patch)
tree16667a711aa8c75d82232c884698e1ad2b745e9e /block/export
parenta606169aca0f086d3835996ca74e2b7b87cd9df5 (diff)
downloadqemu-552c2c4c101335e67ac8ae8ab022d88a8795f2ac.zip
qemu-552c2c4c101335e67ac8ae8ab022d88a8795f2ac.tar.gz
qemu-552c2c4c101335e67ac8ae8ab022d88a8795f2ac.tar.bz2
block/export: avoid g_return_val_if() input validation
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> Message-Id: <20201118091644.199527-5-stefanha@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'block/export')
-rw-r--r--block/export/vhost-user-blk-server.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c
index a3d95ca..ab2c4d4 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -267,7 +267,9 @@ 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)) {
+ return -1;
+ }
memcpy(config, &vexp->blkcfg, len);
return 0;