From patchwork Thu Mar 7 10:36:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 138099 X-Patchwork-Delegate: david.marchand@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 AD0A343BA7; Thu, 7 Mar 2024 11:36:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9284B402C2; Thu, 7 Mar 2024 11:36:33 +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 7B0A540272 for ; Thu, 7 Mar 2024 11:36:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709807792; 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; bh=x3CijOCnxn9+ganVuM95gOvswKS8H9OH7MMRLtcWLFg=; b=MSW7hbJyRzTPv8KzxmdQHn4qHXnZYGIC7t9/TJUpQKJKd8uFwyd+uZOxJSLBpX3p+VdEoQ PVcMrUVgdAaK0ZBPflSg4PGiyVixjvObABeSq7M6aSBjTBaMVL4hHImr2+8yii6ZHL5FQd YBgegTfMI9HEaBpo9xMAPHwf1JvDkFM= 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-180-A-jcDzGDPWKXfkPGuVGUhg-1; Thu, 07 Mar 2024 05:36:28 -0500 X-MC-Unique: A-jcDzGDPWKXfkPGuVGUhg-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 9F907185A781; Thu, 7 Mar 2024 10:36:28 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.225.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FE2A1C05E1C; Thu, 7 Mar 2024 10:36:27 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Maxime Coquelin , Chenbo Xia Subject: [PATCH] vhost: fix virtqueue access lock check for handlers Date: Thu, 7 Mar 2024 11:36:24 +0100 Message-ID: <20240307103624.610080-1-david.marchand@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 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 As the vhost library may receive a request for an unsupported request, it is necessary to check msg_handler before checking if locking queue pairs is requested. Coverity issue: 415049 Fixes: 5e8fcc60b59d ("vhost: enhance virtqueue access lock asserts") Signed-off-by: David Marchand Acked-by: Kevin Traynor Reviewed-by: Maxime Coquelin --- lib/vhost/vhost_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 7fe1687f08..414192500e 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -3171,7 +3171,7 @@ vhost_user_msg_handler(int vid, int fd) * inactive, so it is safe. Otherwise taking the access_lock * would cause a dead lock. */ - if (msg_handler->lock_all_qps) { + if (msg_handler != NULL && msg_handler->lock_all_qps) { if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) { vhost_user_lock_all_queue_pairs(dev); unlock_required = 1;