From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794063355; b=aFLOW4Cy2cSbZ9gwiJdnMh/YkMp1OpS0TaJtygmoX/dYBZpZiH6TTFPUTDJkL77uA6W0 BMYdGmxXV8hxOUtJnM0D1rHbjzENP3AVmcDIDki42ve9AP7QD3wtsDwh2PeFkDCI4B8m7 yxLZ+0Yk+xYHwKnWT/5UB0SHEit4/+jMVxYXB5MFDUZiIVX++8OGWg3KPRizWHuEwNS5B g5daU3KmHWGrdXvs1DMg1iw4wi0kB0+0e2yU4OTNi3oF/ProTpf9h+Ddp4+aGHG40i2zt JVXE67gjGOzX5eK7fKkYatFzuTkdD1keQFp33NT5frH6XJaC1lJ0pzlMX2CoZFFjB6g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063355; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=3Tf9RhvXzeVNzRrkJBzXw1S50nTMiaiyQhgHZI3xI0k=; b=vv36ZBdZsXqT5fnzmW9c+oiYRNN8QlPsPijUQ37TCccJIXfB0wbFqtw74v9cNlAdDYJ4 ZpI8KQPkViRTbNPxxiPNhsHxVJwQKaJe2Vg4mYmWpG7NIxitq/XfUyUkHV5oTBSjjiXgs 7g+vuF0O2KZLToURRr9tMNX2//LMx5+tpAij+9gi3lpXxOjH87ly1FCnd+ld3L5nm17jN +KUxc9Cmuyyt+2eJ7qkcdYE4uLWu2snaZz6pfeIKu9LudXmzTuy61L9lTDAgMkXyapjez 2Sxlhnz+2oHKJSlTcO9wyPv6l1HARVyXHYRCflWhIs+SIA+Fj+mhk7BuCfKUMJnNDAg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=foiyteXe; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7237606D808; Sat, 7 Nov 2026 14:55:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=foiyteXe Received: by smtp.kernel.org (Postfix) with ESMTPSA id 840291F0089F; Sat, 7 Nov 2026 14:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063354; bh=3Tf9RhvXzeVNzRrkJBzXw1S50nTMiaiyQhgHZI3xI0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=foiyteXebgv1wz0ovIeT0DlUeh3ouvzz+2B2Kzw/020wDdiYmsy0OiKrBT3TCDhI/ eRRCbQibqlxUjcLPef1gDJyOuYKWMkIaPgOZc58K0Kp+DetYM+Ese2wgC+nzHntPGG pfGSwfFdgCRJTcEEqdTSLIco+jx4RzR6fg0iuLTw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hannes Reinecke , Christoph Hellwig , Yehyeong Lee , Keith Busch , Sasha Levin Subject: [PATCH 6.18 517/869] nvme-auth: fail when the controller does not authenticate itself Date: Sat, 7 Nov 2026 08:53:19 -0500 Message-ID: <20261107134911.067989690@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yehyeong Lee [ Upstream commit f9e43d924bc74feeb56197de82b2845de2a4b85a ] nvme_auth_process_dhchap_success1() returns success as soon as the controller clears the rvalid flag in its DH-HMAC-CHAP success1 message, without looking at whether the host had asked the controller to authenticate. A host configured with a controller secret sends a challenge in its reply, computes the expected controller response, and sets chap->bi_directional; if the controller then answers with rvalid = 0 the response is never compared, the host still sends success2, and the queue is marked as authenticated. A malicious or man-in-the-middle controller therefore only has to clear one flag to turn the configured bidirectional authentication into a one-way one, without holding any secret of its own. The target side already treats the mirror image of this as fatal: when the host supplied a challenge but no controller key is configured, nvmet_auth_success1() fails the authentication rather than answering with rvalid = 0. Refuse the connection if the controller returns no response although bidirectional authentication was requested. chap->bi_directional is the right condition rather than ctrl->ctrl_key, because secure concatenation sends a challenge only to derive the PSK and deliberately clears bi_directional; a one-way setup without a controller secret keeps returning success as before. Fixes: f50fff73d620 ("nvme: implement In-Band authentication") Cc: stable@vger.kernel.org Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Signed-off-by: Yehyeong Lee Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/auth.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c index 9d73713d6f828..38506314248f6 100644 --- a/drivers/nvme/host/auth.c +++ b/drivers/nvme/host/auth.c @@ -378,8 +378,21 @@ static int nvme_auth_process_dhchap_success1(struct nvme_ctrl *ctrl, nvme_auth_hmac_name(chap->hash_id), nvme_auth_dhgroup_name(chap->dhgroup_id)); - if (!data->rvalid) + if (!data->rvalid) { + /* + * The controller did not return a response. If we asked it to + * authenticate itself the session must not be used, otherwise + * mutual authentication would silently degrade to one-way. + */ + if (chap->bi_directional) { + dev_warn(ctrl->device, + "qid %d: controller did not authenticate\n", + chap->qid); + chap->status = NVME_AUTH_DHCHAP_FAILURE_FAILED; + return -ECONNREFUSED; + } return 0; + } /* Validate controller response */ if (crypto_memneq(chap->response, data->rval, data->hl)) { -- 2.53.0