From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E67DEC71153 for ; Mon, 28 Aug 2023 21:30:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232225AbjH1VaB (ORCPT ); Mon, 28 Aug 2023 17:30:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230311AbjH1V3e (ORCPT ); Mon, 28 Aug 2023 17:29:34 -0400 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2028E186 for ; Mon, 28 Aug 2023 14:29:32 -0700 (PDT) Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3E469240107 for ; Mon, 28 Aug 2023 23:29:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1693258170; bh=oX19WLmDzJGw2VdFB3Bf4BwXWfJaVgu5ZIFFVXxUlTo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=SlQ4B4fgSny27gPHDTID9Nroxoh9u6MBBBkyw6V33LpcBjNc3xinIYbfuwrfhj6Ff mdcbRtKsfIe7Nk+AzvKtZsbYZhk5Nen5RSenDwxDXvbec5uZ/uAoAojeQt+35Xb2LQ 9cRHiCN4J1nt9i5Lj/dE7hqAB+rFJzqiJBi8h9QsRZC4E8YWxJouW3RDAEItwZyLCK CcXzDnFVnukwHPtMfRhfYvj18AgQcthte+raKcV2Ul6X+6bi55qC0cjrrVBB+YEKRf 3OxGB0UCjYLAl/eRw6Jsf063HnoEOq9XELldi58eNbAqyNJhurPF/Mb+EqcGl0EuQN 62BBR/YFjzsDg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RZNx46vF6z9s4m; Mon, 28 Aug 2023 23:29:28 +0200 (CEST) From: Mark O'Donovan To: linux-kernel@vger.kernel.org Cc: linux-nvme@lists.infradead.org, sagi@grimberg.me, hch@lst.de, axboe@kernel.dk, kbusch@kernel.org, hare@suse.de, Mark O'Donovan Subject: [PATCH 2/2] nvme-tcp: always set valid seq_num in dhchap reply Date: Mon, 28 Aug 2023 21:20:33 +0000 Message-Id: <20230828212033.3244512-2-shiftee@posteo.net> In-Reply-To: <20230828212033.3244512-1-shiftee@posteo.net> References: <20230828212033.3244512-1-shiftee@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently a seqnum of zero is sent during uni-directional authentication. The zero value is reserved for the secure channel feature which is not yet implemented. Signed-off-by: Mark O'Donovan --- drivers/nvme/host/auth.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c index 49f8c46bddf1..bf32a43fe5df 100644 --- a/drivers/nvme/host/auth.c +++ b/drivers/nvme/host/auth.c @@ -314,15 +314,14 @@ static int nvme_auth_set_dhchap_reply_data(struct nvme_ctrl *ctrl, if (ctrl->ctrl_key) { get_random_bytes(chap->c2, chap->hash_len); data->cvalid = 1; - chap->s2 = nvme_auth_get_seqnum(); memcpy(data->rval + chap->hash_len, chap->c2, chap->hash_len); dev_dbg(ctrl->device, "%s: qid %d ctrl challenge %*ph\n", __func__, chap->qid, (int)chap->hash_len, chap->c2); } else { memset(chap->c2, 0, chap->hash_len); - chap->s2 = 0; } + chap->s2 = nvme_auth_get_seqnum(); data->seqnum = cpu_to_le32(chap->s2); if (chap->host_key_len) { dev_dbg(ctrl->device, "%s: qid %d host public key %*ph\n", -- 2.39.2