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 68DF3433A7 for ; Thu, 23 Nov 2023 11:11:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6381D402A6; Thu, 23 Nov 2023 11:11:46 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 900E842F0C for ; Thu, 23 Nov 2023 11:11:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700734304; 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=7ygT7i+hpMkv5hs3NKhnPLNGykwFc+IkEBH+ppYJzao=; b=LKAUE4Q8l1sxBkkxEfs1CEJAmUjcsIdjS0tpLSmRJmJiZg0pQ4zpSj5OmzurPDfLVzOJQe vt3PPAnZIFp0PE6D3jqAZs2tsB3rq0BcHIhONe07i21q/N6lyG9VQPU8dfV2VUo27rW5gs E24YikL+hO54cW/91BfwWlNtlJPl3NU= 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-496-NZ-izGjVOme5GE_dkldkdQ-1; Thu, 23 Nov 2023 05:11:42 -0500 X-MC-Unique: NZ-izGjVOme5GE_dkldkdQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 0F279101A53B for ; Thu, 23 Nov 2023 10:11:42 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9A221C060B0; Thu, 23 Nov 2023 10:11:40 +0000 (UTC) From: Maxime Coquelin To: ktraynor@redhat.com, stable@dpdk.org Cc: Maxime Coquelin , David Marchand Subject: [PATCH v21.11.6 2/2] vhost: fix missing lock protection in power monitor API Date: Thu, 23 Nov 2023 11:11:31 +0100 Message-ID: <20231123101131.98389-2-maxime.coquelin@redhat.com> In-Reply-To: <20231123101131.98389-1-maxime.coquelin@redhat.com> References: <20231123101131.98389-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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 The power monitor get API is missing both access lock protection and access status check. Fixes: 34fd4373ce76 ("vhost: add power monitor API") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin Acked-by: David Marchand (cherry picked from commit b4c4e5675c85a9b471c252305811d15f6a6d2aa6) Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 19c7b92c32..a544839de3 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -2014,6 +2014,7 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, { struct virtio_net *dev = get_device(vid); struct vhost_virtqueue *vq; + int ret = 0; if (dev == NULL) return -1; @@ -2024,6 +2025,13 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, if (vq == NULL) return -1; + rte_spinlock_lock(&vq->access_lock); + + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) { struct vring_packed_desc *desc; desc = vq->desc_packed; @@ -2043,7 +2051,10 @@ rte_vhost_get_monitor_addr(int vid, uint16_t queue_id, pmc->match = 0; } - return 0; +out_unlock: + rte_spinlock_unlock(&vq->access_lock); + + return ret; } -- 2.42.0