From patchwork Fri Feb 7 18:41:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongli Zhang X-Patchwork-Id: 13965590 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED6361B87D3; Fri, 7 Feb 2025 18:43:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738953791; cv=none; b=Ae/E1rfyTYY93zSHJcq5LYbCPRUlUdXGYrKn3VSXLwTPsxgRflqoLmwDCoIM4al1hccT66vVnLnX1GcYvuKCDdK/67CPVZ26I1pIxxrWcj3Kzm2R7bqPHn7ARfkgK9OuLwXGlZc5o1Rv9MazrRKWGcBPkAEaeP1FyYMsr9PI0a8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738953791; c=relaxed/simple; bh=TheOBRcnGVBP3+zBn1fo/KIGp8ZORIbEsBySJSBTXRM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DIxOGbe+YFaUycqsto5Qx7hdzNwkQpoosIQCgBf7YYXbzGL5i0Xrz6Z9a+5rJbw8cQAYFZOQglf7cqYTRrvGIp5va+7UuIuo4E9VbKZYeIdu45Xwyu1UbIeXOsjhyjruRVh3zO1eM8CWchp6F+zUTHv6gCteAw6dRifEyoAmQ24= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=N+4NwIw5; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="N+4NwIw5" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 517Hg6XQ000481; Fri, 7 Feb 2025 18:43:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2023-11-20; bh=0f86d riItZ6Voi0DN/wvEX77XPRc7/eHLKbBCszuiEc=; b=N+4NwIw5PBSjAHyk6ALR+ pe4ATEBVeT4lpSXndz9zZKXZ1SgrQQkbCbHzJSMNBNTWULJCYzEVQhi1j04l5VPz ggiH4yteJjFkMDRdBXOI8KNXxzkcyQBVwCPvVsa8bPde7qyWjKG2xBrSfQAt0v3A sghk1f6QVHeTNG/Zlp1UYyIaDWkH4q4C9FBp3eYYR0vB8uMCQQaCZf6zwN7jXGl7 gwprXXfkCWekxv/2gUowJEV7mCwwIZs3ZzXkQh+h3S+l/F485X9jcRF2UYNW+FF/ wfjV6lguJb6kb0t6Dvm0XeIXFK0tbUtNaSwYysNGZex7QZaO0mHXLzdnaHsKC68f g== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44mqk8bbhh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 07 Feb 2025 18:43:01 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 517HTvB2022565; Fri, 7 Feb 2025 18:43:01 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44j8ec86ar-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 07 Feb 2025 18:43:01 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 517Idx9Z037660; Fri, 7 Feb 2025 18:43:00 GMT Received: from localhost.localdomain (ca-dev80.us.oracle.com [10.211.9.80]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 44j8ec8665-9; Fri, 07 Feb 2025 18:43:00 +0000 From: Dongli Zhang To: virtualization@lists.linux.dev, netdev@vger.kernel.org, kvm@vger.kernel.org Cc: mst@redhat.com, jasowang@redhat.com, eperezma@redhat.com, michael.christie@oracle.com, pbonzini@redhat.com, stefanha@redhat.com, joao.m.martins@oracle.com, joe.jin@oracle.com, si-wei.liu@oracle.com, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] vhost-scsi: protect vq->log_used with vq->mutex Date: Fri, 7 Feb 2025 10:41:52 -0800 Message-ID: <20250207184212.20831-9-dongli.zhang@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250207184212.20831-1-dongli.zhang@oracle.com> References: <20250207184212.20831-1-dongli.zhang@oracle.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-07_08,2025-02-07_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2501170000 definitions=main-2502070139 X-Proofpoint-GUID: fI64uTZGsKRvKXVVXcvMNBOXPI3Lm_Wb X-Proofpoint-ORIG-GUID: fI64uTZGsKRvKXVVXcvMNBOXPI3Lm_Wb The vhost-scsi completion path may access vq->log_base when vq->log_used is already set to false. vhost-thread QEMU-thread vhost_scsi_complete_cmd_work() -> vhost_add_used() -> vhost_add_used_n() if (unlikely(vq->log_used)) QEMU disables vq->log_used via VHOST_SET_VRING_ADDR. mutex_lock(&vq->mutex); vq->log_used = false now! mutex_unlock(&vq->mutex); QEMU gfree(vq->log_base) log_used() -> log_write(vq->log_base) Assuming the VMM is QEMU. The vq->log_base is from QEMU userpace and can be reclaimed via gfree(). As a result, this causes invalid memory writes to QEMU userspace. The control queue path has the same issue. Signed-off-by: Dongli Zhang --- drivers/vhost/scsi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 40268b88f470..3b87d698adaf 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -645,7 +645,9 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work) if (likely(ret == sizeof(v_rsp))) { signal = true; + mutex_lock(&cmd->tvc_vq->mutex); vhost_add_used(cmd->tvc_vq, cmd->tvc_vq_desc, 0); + mutex_unlock(&cmd->tvc_vq->mutex); } else pr_err("Faulted on virtio_scsi_cmd_resp\n"); @@ -1371,8 +1373,10 @@ static void vhost_scsi_tmf_resp_work(struct vhost_work *work) else resp_code = VIRTIO_SCSI_S_FUNCTION_REJECTED; + mutex_lock(&tmf->svq->vq.mutex); vhost_scsi_send_tmf_resp(tmf->vhost, &tmf->svq->vq, tmf->in_iovs, tmf->vq_desc, &tmf->resp_iov, resp_code); + mutex_unlock(&tmf->svq->vq.mutex); if (unlikely(tmf->tmf_log_num)) { mutex_lock(&tmf->svq->vq.mutex);