From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2C1242701D9; Tue, 12 May 2026 17:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608786; cv=none; b=rq1I/zBtTEZfjGf9ucs06i8ITRy87mAzOuyYK/xGwbCmztvNBlxajTcvAH5SBHbuLSIoiUZlyq9c8R5tAZ3+S5AX9m6WwH7YI7odBsUXO3NO4RAbzkOMjAQBZQ1y8dCuXdE+Vvr7iEQ8srSEQpKcs2+A4+TxhNIREq7GgjJiNw0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608786; c=relaxed/simple; bh=HBnAPMQ+OgQoaiL5HqlQW2CBIAZSKKIjxcBOiRSX+ZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AuLXxocZlX0HDPxtjVnfkkqKfCtMtdqR3gO/oEqx4BiRQEgxxKv60VXOHbuYEmpJme7wc2xbUfAHthCx+ibEeHPbnQQY71a0BKkPYloVr3kpZGkSMYcEwOsTL1WiKi0n4F3jBJBtlKxJ141VxkcZCK/00eekx3x2byjVwB5PvO0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tH23qf8a; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tH23qf8a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79FF1C2BCB0; Tue, 12 May 2026 17:59:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778608785; bh=HBnAPMQ+OgQoaiL5HqlQW2CBIAZSKKIjxcBOiRSX+ZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tH23qf8aDZoTgstpmfBXVS9hitdxEmE5KezmxiLPEGXOBrq9RMqz9MhuTNJ2TNs8Y uPEUK08Pqlypq1hEZF15FXu9muBsMNwqNUkCAe1VqISObmcaGEoltEeGatWqgLpzG7 4tjcjlqr978GQwIKY8z9/3OO4FtCDrj5BHxdRKI0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Junxian Huang , Jason Gunthorpe Subject: [PATCH 6.18 172/270] RDMA/hns: Fix unlocked call to hns_roce_qp_remove() Date: Tue, 12 May 2026 19:39:33 +0200 Message-ID: <20260512173942.069561024@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173938.452574370@linuxfoundation.org> References: <20260512173938.452574370@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Gunthorpe commit 0c99acbc8b6c6dd526ae475a48ee1897b61072fb upstream. Sashiko points out that hns_roce_qp_remove() requires the caller to hold locks. The error flow in hns_roce_create_qp_common() doesn't hold those locks for the error unwind so it risks corrupting memory. Grab the same locks the other two callers use. Cc: stable@vger.kernel.org Fixes: e088a685eae9 ("RDMA/hns: Support rq record doorbell for the user space") Link: https://sashiko.dev/#/patchset/0-v2-1c49eeb88c48%2B91-rdma_udata_rep_jgg%40nvidia.com?part=9 Link: https://patch.msgid.link/r/15-v1-41f3135e5565+9d2-rdma_ai_fixes1_jgg@nvidia.com Reviewed-by: Junxian Huang Signed-off-by: Jason Gunthorpe Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/hns/hns_roce_qp.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/infiniband/hw/hns/hns_roce_qp.c +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c @@ -1150,6 +1150,7 @@ static int hns_roce_create_qp_common(str struct hns_roce_ib_create_qp_resp resp = {}; struct ib_device *ibdev = &hr_dev->ib_dev; struct hns_roce_ib_create_qp ucmd = {}; + unsigned long flags; int ret; mutex_init(&hr_qp->mutex); @@ -1236,7 +1237,13 @@ static int hns_roce_create_qp_common(str return 0; err_flow_ctrl: + spin_lock_irqsave(&hr_dev->qp_list_lock, flags); + hns_roce_lock_cqs(init_attr->send_cq ? to_hr_cq(init_attr->send_cq) : NULL, + init_attr->recv_cq ? to_hr_cq(init_attr->recv_cq) : NULL); hns_roce_qp_remove(hr_dev, hr_qp); + hns_roce_unlock_cqs(init_attr->send_cq ? to_hr_cq(init_attr->send_cq) : NULL, + init_attr->recv_cq ? to_hr_cq(init_attr->recv_cq) : NULL); + spin_unlock_irqrestore(&hr_dev->qp_list_lock, flags); err_store: free_qpc(hr_dev, hr_qp); err_qpc: