From: Ilya Maximets <i.maximets@samsung.com>
Date: Wed, 24 Feb 2016 10:44:34 +0000 (+0300)
Subject: vhost-user: verify that number of queues is less than MAX_QUEUE_NUM
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fff4e48ed54cc39e5942921df91300646ad37707;p=qemu.git

vhost-user: verify that number of queues is less than MAX_QUEUE_NUM

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 <i.maximets@samsung.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---

diff --git a/net/vhost-user.c b/net/vhost-user.c
index 451dbbfb27..b753b3d800 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;
     }