summaryrefslogtreecommitdiffstats
path: root/contrib/vhost-user-input
diff options
context:
space:
mode:
authorStefan Hajnoczi2020-11-18 10:16:43 +0100
committerMichael S. Tsirkin2020-12-09 19:04:17 +0100
commita606169aca0f086d3835996ca74e2b7b87cd9df5 (patch)
tree85c8e619dbf509180f7461e2c9c59253e616fd82 /contrib/vhost-user-input
parentcontrib/vhost-user-gpu: avoid g_return_val_if() input validation (diff)
downloadqemu-a606169aca0f086d3835996ca74e2b7b87cd9df5.tar.gz
qemu-a606169aca0f086d3835996ca74e2b7b87cd9df5.tar.xz
qemu-a606169aca0f086d3835996ca74e2b7b87cd9df5.zip
contrib/vhost-user-input: 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-4-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-input')
-rw-r--r--contrib/vhost-user-input/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 3ea840cf44..d2de47cee7 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -211,7 +211,9 @@ static int vi_get_config(VuDev *dev, uint8_t *config, uint32_t len)
{
VuInput *vi = container_of(dev, VuInput, dev.parent);
- g_return_val_if_fail(len <= sizeof(*vi->sel_config), -1);
+ if (len > sizeof(*vi->sel_config)) {
+ return -1;
+ }
if (vi->sel_config) {
memcpy(config, vi->sel_config, len);