From: Stefan Hajnoczi Date: Wed, 18 Nov 2020 09:16:42 +0000 (+0000) Subject: contrib/vhost-user-gpu: avoid g_return_val_if() input validation X-Git-Tag: qemu-xen-4.16.0-rc4~445^2~13 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fa77464ffe14be9532b861b33f57f5c1d63a4824;p=qemu-xen.git contrib/vhost-user-gpu: 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-3-stefanha@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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();