From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5263C2D0C0 for ; Mon, 23 Dec 2019 13:19:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98D7C2073A for ; Mon, 23 Dec 2019 13:19:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98D7C2073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijNc5-0004n9-Lc for qemu-devel@archiver.kernel.org; Mon, 23 Dec 2019 08:19:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41361) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijNbY-0004LJ-SE for qemu-devel@nongnu.org; Mon, 23 Dec 2019 08:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijNbX-00051y-Ln for qemu-devel@nongnu.org; Mon, 23 Dec 2019 08:18:36 -0500 Received: from relay.sw.ru ([185.231.240.75]:52930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ijNbX-0004xu-Ec for qemu-devel@nongnu.org; Mon, 23 Dec 2019 08:18:35 -0500 Received: from dptest2.qa.sw.ru ([10.94.4.71]) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ijNbP-0003NG-8b; Mon, 23 Dec 2019 16:18:27 +0300 From: Denis Plotnikov To: qemu-devel@nongnu.org Subject: [PATCH v1] virtio: stregthen virtqueue size invariants Date: Mon, 23 Dec 2019 16:18:20 +0300 Message-Id: <20191223131820.19300-1-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 1. virtqueue_size is a power of 2 2. virtqueue_size > 2, since seg_max is virtqueue_size - 2 Signed-off-by: Denis Plotnikov --- hw/virtio/virtio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 04716b5f6c..e3ab69061e 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2166,7 +2166,8 @@ void virtio_queue_set_num(VirtIODevice *vdev, int n, int num) */ if (!!num != !!vdev->vq[n].vring.num || num > VIRTQUEUE_MAX_SIZE || - num < 0) { + num < 2 || + !is_power_of_2(num)) { return; } vdev->vq[n].vring.num = num; -- 2.17.0