[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] contrib/vhost-user-input: avoid g_return_val_if() input vali
From: |
Stefan Hajnoczi |
Subject: |
[PATCH 3/4] contrib/vhost-user-input: avoid g_return_val_if() input validation |
Date: |
Wed, 18 Nov 2020 09:16:43 +0000 |
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>
---
contrib/vhost-user-input/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 6020c6f33a..50a8a03d9b 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -212,7 +212,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);
--
2.28.0
- [PATCH 0/4] vhost-user: avoid g_return_val_if() in get/set_config(), Stefan Hajnoczi, 2020/11/18
- [PATCH 1/4] contrib/vhost-user-blk: avoid g_return_val_if() input validation, Stefan Hajnoczi, 2020/11/18
- [PATCH 2/4] contrib/vhost-user-gpu: avoid g_return_val_if() input validation, Stefan Hajnoczi, 2020/11/18
- [PATCH 3/4] contrib/vhost-user-input: avoid g_return_val_if() input validation,
Stefan Hajnoczi <=
- [PATCH 4/4] block/export: avoid g_return_val_if() input validation, Stefan Hajnoczi, 2020/11/18
- Re: [PATCH 0/4] vhost-user: avoid g_return_val_if() in get/set_config(), Marc-André Lureau, 2020/11/18
- Re: [PATCH 0/4] vhost-user: avoid g_return_val_if() in get/set_config(), Markus Armbruster, 2020/11/18
- Re: [PATCH 0/4] vhost-user: avoid g_return_val_if() in get/set_config(), Stefano Garzarella, 2020/11/23