[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 54/65] block/export: avoid g_return_val_if() input validation
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 54/65] block/export: avoid g_return_val_if() input validation |
Date: |
Wed, 9 Dec 2020 13:10:48 -0500 |
From: Stefan Hajnoczi <stefanha@redhat.com>
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-5-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
block/export/vhost-user-blk-server.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/export/vhost-user-blk-server.c
b/block/export/vhost-user-blk-server.c
index a3d95ca012..ab2c4d44c4 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -267,7 +267,9 @@ vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint32_t
len)
VuServer *server = container_of(vu_dev, VuServer, vu_dev);
VuBlkExport *vexp = container_of(server, VuBlkExport, vu_server);
- g_return_val_if_fail(len <= sizeof(struct virtio_blk_config), -1);
+ if (len > sizeof(struct virtio_blk_config)) {
+ return -1;
+ }
memcpy(config, &vexp->blkcfg, len);
return 0;
--
MST
- [PULL v2 48/65] libvhost-user: make it a meson subproject, (continued)
- [PULL v2 49/65] libvhost-user: add a simple link test without glib, Michael S. Tsirkin, 2020/12/09
- [PULL v2 51/65] contrib/vhost-user-blk: avoid g_return_val_if() input validation, Michael S. Tsirkin, 2020/12/09
- [PULL v2 50/65] .gitlab-ci: add build-libvhost-user, Michael S. Tsirkin, 2020/12/09
- [PULL v2 52/65] contrib/vhost-user-gpu: avoid g_return_val_if() input validation, Michael S. Tsirkin, 2020/12/09
- [PULL v2 53/65] contrib/vhost-user-input: avoid g_return_val_if() input validation, Michael S. Tsirkin, 2020/12/09
- [PULL v2 55/65] hw/i386/pc: add max combined fw size as machine configuration option, Michael S. Tsirkin, 2020/12/09
- [PULL v2 54/65] block/export: avoid g_return_val_if() input validation,
Michael S. Tsirkin <=
- [PULL v2 56/65] acpi: cpuhp: introduce 'firmware performs eject' status/control bits, Michael S. Tsirkin, 2020/12/09
- [PULL v2 57/65] x86: acpi: introduce AcpiPmInfo::smi_on_cpu_unplug, Michael S. Tsirkin, 2020/12/09
- [PULL v2 58/65] tests/acpi: allow expected files change, Michael S. Tsirkin, 2020/12/09
- [PULL v2 59/65] x86: acpi: let the firmware handle pending "CPU remove" events in SMM, Michael S. Tsirkin, 2020/12/09
- [PULL v2 61/65] x86: ich9: factor out "guest_cpu_hotplug_features", Michael S. Tsirkin, 2020/12/09
- [PULL v2 60/65] tests/acpi: update expected files, Michael S. Tsirkin, 2020/12/09
- [PULL v2 63/65] pcie_aer: Fix help message of pcie_aer_inject_error command, Michael S. Tsirkin, 2020/12/09
- [PULL v2 64/65] hw/virtio-pci Added counter for pcie capabilities offsets., Michael S. Tsirkin, 2020/12/09
- [PULL v2 65/65] hw/virtio-pci Added AER capability., Michael S. Tsirkin, 2020/12/09
- [PULL v2 37/65] failover: remove failover_find_primary_device() error parameter, Michael S. Tsirkin, 2020/12/09