From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5348A53C3B2; Wed, 23 Sep 2026 14:47:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790174846; cv=none; b=Yzj1H3PekGSqxbmXzb9ipJd7kupa6z1VbcPPAHaGM3+jGMkDluxF3q2ICO0JLMLgSD/idNRRr+0BSLnO5vvnIwnTsPUSbDaovHUWs8Pa+aLcO/GUNkoDCnvRWiSRxu3lOig79kTnJzo86sfozLI4Sl6M/atYC5kZsTWRJtbfLDc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790174846; c=relaxed/simple; bh=JXR9fbWjlj3Dhn0GgrFvxjtN37/ONhdN1qtfdM3CN1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bg+Ro5gZ+2CoUU+h0dQ86sSx8FUIMjHGcb84QvMcUQ+0MVhH+/HWUMjS6fFUQpVlFe318jtbHys9hlm5Kb6fGgw9XKnz5O7bw6GPuIZU1I9C6FPyMHQBuhblHQg0SYCP25muBp++5RweeKpwxf4uTh5OtyKauPefCFEEultUuLw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iM0HTPkR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="iM0HTPkR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7A791F000FF; Wed, 23 Sep 2026 14:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790174845; bh=U0lzt//IruzdO0at3hoeKPUueSwPkYlajNsn1p9ZtLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iM0HTPkRzhE9rJuUiPBVrAPNma4cGDMyFXGKzlm2cgwZc92Kh2PTlloZVYw6dx57U DZTN+N8KXRXPSVTNCH+ZKtZtH3EGzJxyG+06TgABToBmH32yBf6ehftKGGLvoEahuz fy67O0/OU/PhQ3AqZz8rXtrOmbNBwB7YmRlSFrLo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, TencentOS Corvus AI , Allison Henderson , Aohan Mei , Jakub Kicinski Subject: [PATCH 6.18 209/398] rds: ib: use rds_conn_drop() on protocol version mismatch Date: Wed, 23 Sep 2026 16:04:43 +0200 Message-ID: <20260923140648.839278946@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923140643.441954610@linuxfoundation.org> References: <20260923140643.441954610@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: Aohan Mei commit f97d8c7bab7843631206a114986c9059da03efeb upstream. rds_ib_cm_connect_complete() runs from the RDMA-CM event handler with conn->c_cm_lock held. When the peer negotiates a protocol version older than RDS_PROTOCOL_COMPAT_VERSION, the handler calls rds_conn_destroy(), which is only safe in the rmmod path: it synchronously tears the connection down and flush_work()es the shutdown work cp_down_w. That shutdown work (rds_conn_shutdown()) needs cp_cm_lock, which is the very lock the event handler still holds, so the flush never completes: the two workers wait on each other and the RDS connection workqueues stall for good. All other RDMA-CM failure paths (REJECTED, CONNECT_ERROR, DISCONNECTED) use rds_conn_drop(), which marks the connection RDS_CONN_ERROR and schedules the shutdown work asynchronously. Use it here as well. Fixes: f147dd9ecabf ("RDS/IB: Disallow connections less than RDS 3.1") Reported-by: TencentOS Corvus AI Cc: stable@vger.kernel.org Reviewed-by: Allison Henderson Signed-off-by: Aohan Mei Link: https://patch.msgid.link/20260911073436.3542080-1-ljp1205831794@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/rds/ib_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -115,7 +115,7 @@ void rds_ib_cm_connect_complete(struct r &conn->c_laddr, &conn->c_faddr, RDS_PROTOCOL_MAJOR(conn->c_version), RDS_PROTOCOL_MINOR(conn->c_version)); - rds_conn_destroy(conn); + rds_conn_drop(conn); return; } }