From: Stefan Hajnoczi Date: Wed, 18 Nov 2020 09:16:41 +0000 (+0000) Subject: contrib/vhost-user-blk: avoid g_return_val_if() input validation X-Git-Tag: v6.0.0-rc0~195^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acb1f3c248a83fb66d705068ed7d098b898632b1;p=thirdparty%2Fqemu.git 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 Signed-off-by: Stefan Hajnoczi Message-Id: <20201118091644.199527-2-stefanha@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c index 6abd7835a85..d14b2896bf0 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);