From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 45D7D43345 for ; Thu, 16 Nov 2023 14:24:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13AC84067C; Thu, 16 Nov 2023 14:24:11 +0100 (CET) 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 5545E402C6 for ; Thu, 16 Nov 2023 14:24:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141048; 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=NRYKgPnnA7GIIaxlq7T5o9dopKijCNwakig9/dZQWb4=; b=VgkTQdCiJMr2alraj1jyUZnAOnsKJkJS8NPcF0ebLqJaeWJUWJOqFAcgn+XbelhDx5UAa0 03iR0S8lcyGBRXQd+pwZ3F6QvtsgApHcdpu2C7WtHTVuEtLnsRsbBuuO9qM/WEBb9qAs1s LfqBZeaci3atIpnuXlCDupvTZG+A8dc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-247-GDGFa-UePrCvEPLPT74dTg-1; Thu, 16 Nov 2023 08:24:07 -0500 X-MC-Unique: GDGFa-UePrCvEPLPT74dTg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7712D85A58A for ; Thu, 16 Nov 2023 13:24:07 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 721662166B27; Thu, 16 Nov 2023 13:24:06 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: David Marchand , dpdk stable Subject: patch 'vhost: fix missing check on virtqueue access' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:22:48 +0000 Message-ID: <20231116132348.557257-6-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/900cc61cbecf2d4e780cf6ccd36b799b4f0865e7 Thanks. Kevin --- >From 900cc61cbecf2d4e780cf6ccd36b799b4f0865e7 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 20 Oct 2023 10:47:59 +0200 Subject: [PATCH] vhost: fix missing check on virtqueue access [ upstream commit 094c442cdbf1da3a19ae82ca7069fee8b3a43343 ] 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: 4e0de8dac853 ("vhost: protect vring access done by application") Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- lib/vhost/vhost.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index c72c9aa40e..45e34e0df1 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1376,5 +1376,8 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) rte_spinlock_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; @@ -1468,7 +1471,13 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) rte_spinlock_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + vq->notif_enable = enable; ret = vhost_enable_guest_notification(dev, vq, enable); +out_unlock: rte_spinlock_unlock(&vq->access_lock); @@ -1530,5 +1539,8 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) rte_spinlock_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:52.733207167 +0000 +++ 0006-vhost-fix-missing-check-on-virtqueue-access.patch 2023-11-16 13:21:52.399946226 +0000 @@ -1 +1 @@ -From 094c442cdbf1da3a19ae82ca7069fee8b3a43343 Mon Sep 17 00:00:00 2001 +From 900cc61cbecf2d4e780cf6ccd36b799b4f0865e7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 094c442cdbf1da3a19ae82ca7069fee8b3a43343 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index b438330063..43173c9eee 100644 +index c72c9aa40e..45e34e0df1 100644 @@ -24,2 +25,2 @@ -@@ -1421,5 +1421,8 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) - rte_rwlock_write_lock(&vq->access_lock); +@@ -1376,5 +1376,8 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) + rte_spinlock_lock(&vq->access_lock); @@ -34,2 +35,2 @@ -@@ -1513,7 +1516,13 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) - rte_rwlock_write_lock(&vq->access_lock); +@@ -1468,7 +1471,13 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) + rte_spinlock_lock(&vq->access_lock); @@ -46 +47 @@ - rte_rwlock_write_unlock(&vq->access_lock); + rte_spinlock_unlock(&vq->access_lock); @@ -48,2 +49,2 @@ -@@ -1608,5 +1617,8 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) - rte_rwlock_write_lock(&vq->access_lock); +@@ -1530,5 +1539,8 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) + rte_spinlock_lock(&vq->access_lock);