diff options
| author | Stefan Hajnoczi | 2020-11-18 10:16:41 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2020-12-09 19:04:17 +0100 |
| commit | acb1f3c248a83fb66d705068ed7d098b898632b1 (patch) | |
| tree | bcd2d0a5343e5e2aae7adca1167016422e982d26 /contrib/vhost-user-blk | |
| parent | .gitlab-ci: add build-libvhost-user (diff) | |
| download | qemu-acb1f3c248a83fb66d705068ed7d098b898632b1.tar.gz qemu-acb1f3c248a83fb66d705068ed7d098b898632b1.tar.xz qemu-acb1f3c248a83fb66d705068ed7d098b898632b1.zip | |
contrib/vhost-user-blk: 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-2-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'contrib/vhost-user-blk')
| -rw-r--r-- | contrib/vhost-user-blk/vhost-user-blk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c index 6abd7835a8..d14b2896bf 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -403,7 +403,9 @@ vub_get_config(VuDev *vu_dev, uint8_t *config, uint32_t len) VugDev *gdev; VubDev *vdev_blk; - g_return_val_if_fail(len <= sizeof(struct virtio_blk_config), -1); + if (len > sizeof(struct virtio_blk_config)) { + return -1; + } gdev = container_of(vu_dev, VugDev, parent); vdev_blk = container_of(gdev, VubDev, parent); |