[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM |
Date: |
Tue, 15 Mar 2016 17:00:40 +0200 |
From: Ilya Maximets <address@hidden>
Fix QEMU crash when -netdev vhost-user,queues=n is passed with number
of queues greater than MAX_QUEUE_NUM.
Signed-off-by: Ilya Maximets <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Jason Wang <address@hidden>
---
net/vhost-user.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 451dbbf..b753b3d 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -317,9 +317,10 @@ int net_init_vhost_user(const NetClientOptions *opts,
const char *name,
}
queues = vhost_user_opts->has_queues ? vhost_user_opts->queues : 1;
- if (queues < 1) {
+ if (queues < 1 || queues > MAX_QUEUE_NUM) {
error_setg(errp,
- "vhost-user number of queues must be bigger than zero");
+ "vhost-user number of queues must be in range [1, %d]",
+ MAX_QUEUE_NUM);
return -1;
}
--
MST
- [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 01/51] acpi: add aml_create_field(), Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 04/51] acpi: add build_append_named_dword, returning an offset in buffer, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 03/51] acpi: allow using object as offset for OperationRegion, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 02/51] acpi: add aml_concatenate(), Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 05/51] balloon: fix segfault and harden the stats queue, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 08/51] virtio-balloon: add 'available' counter, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 11/51] i386/acpi: make floppy controller object dynamic, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 10/51] pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy(), Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 12/51] i386: expose floppy drive CMOS type, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 13/51] fdc: add function to determine drive chs limits, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 15/51] i386: update expected DSDT, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 14/51] i386: populate floppy drive information in DSDT, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 16/51] virtio-pci: call pci reset variant when guest requests reset., Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 18/51] ich9lpc: fix typo, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 19/51] hw/acpi: fix Q35 support for legacy Windows OS, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 20/51] acpi-test-data: add _DIS methods, Michael S. Tsirkin, 2016/03/15