From patchwork Mon Sep 25 16:36:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 131892 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 24F9342637; Mon, 25 Sep 2023 18:36:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F67440E6E; Mon, 25 Sep 2023 18:36:34 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 78ED740E7C for ; Mon, 25 Sep 2023 18:36:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695659792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7eLsUy5+wGCD98MgwufspfVJ+nl4Rlbe/LEwp4wj3S4=; b=jTOWLL2dflG4OKVT810erO2qyMjKih/h9JCiLdxXUKT93D71U6qbGNJk3t9tk+YjkL1fho vcC3pvUbR7UYJ1bJNnaciRTlDyZq8p94hLD7gOXLVZRTB+L78RPRuIrepMQWET3YsO0VBe R5K2DacUy2ayfP9txrasgPIHXiMRZeU= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-645-LNPppveIMwSW68olzc3hqg-1; Mon, 25 Sep 2023 12:36:28 -0400 X-MC-Unique: LNPppveIMwSW68olzc3hqg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8FD141C0758C; Mon, 25 Sep 2023 16:36:27 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id C261210EE402; Mon, 25 Sep 2023 16:36:24 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, chenbo.xia@intel.com, mb@smartsharesystems.com Cc: Maxime Coquelin , stable@dpdk.org, Li Feng Subject: [PATCH 1/7] vhost: fix missing vring call check on virtqueue access Date: Mon, 25 Sep 2023 18:36:04 +0200 Message-ID: <20230925163610.3307750-2-maxime.coquelin@redhat.com> In-Reply-To: <20230925163610.3307750-1-maxime.coquelin@redhat.com> References: <20230925163610.3307750-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Acquiring the access lock is not enough to ensure virtqueue's metadata such as vring pointers are valid. The access status must also be checked. Fixes: c5736998305d ("vhost: fix missing virtqueue lock protection") Fixes: 830f7e790732 ("vhost: add non-blocking API for posting interrupt") Cc: stable@dpdk.org Reported-by: Li Feng Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index c03bb9c6eb..e9c775fa26 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1328,6 +1328,7 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1342,14 +1343,20 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) rte_rwlock_read_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_rwlock_read_unlock(&vq->access_lock); - return 0; + return ret; } int @@ -1357,6 +1364,7 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1372,14 +1380,20 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) if (rte_rwlock_read_trylock(&vq->access_lock)) return -EAGAIN; + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_rwlock_read_unlock(&vq->access_lock); - return 0; + return ret; } uint16_t