diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2020-11-18 09:16:43 +0000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-12-09 13:04:17 -0500 |
| commit | a606169aca0f086d3835996ca74e2b7b87cd9df5 (patch) | |
| tree | 85c8e619dbf509180f7461e2c9c59253e616fd82 | |
| parent | fa77464ffe14be9532b861b33f57f5c1d63a4824 (diff) | |
| download | focaccia-qemu-a606169aca0f086d3835996ca74e2b7b87cd9df5.tar.gz focaccia-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>
| -rw-r--r-- | contrib/vhost-user-input/main.c | 4 |
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); |