From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeOfe-00084d-NO for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:08:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeOfY-0008NV-K7 for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:08:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeOfY-0008NR-FC for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:08:00 -0500 Date: Fri, 11 Mar 2016 17:07:56 +0200 From: "Michael S. Tsirkin" Message-ID: <1457708548-14093-10-git-send-email-mst@redhat.com> References: <1457708548-14093-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1457708548-14093-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 09/53] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ilya Maximets , Peter Maydell , Jason Wang , Eduardo Habkost From: Ilya Maximets 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang --- 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