From patchwork Wed Oct 25 10:51:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark O'Donovan X-Patchwork-Id: 158029 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2509537vqx; Wed, 25 Oct 2023 03:52:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFS4WX1Lcw0S1BQPrcF2FnFQDap9+hv7jxu+lC/fvC9ie+0urgntT4137Ms1i95ZZ8h4MT X-Received: by 2002:a05:6808:ab7:b0:3ad:f5b7:d691 with SMTP id r23-20020a0568080ab700b003adf5b7d691mr16085729oij.18.1698231141927; Wed, 25 Oct 2023 03:52:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698231141; cv=none; d=google.com; s=arc-20160816; b=RirT1MFYwRkoWbkGXzk070JNRhWsXpii9kk/jrl9wR5fJl2MBmcg8bjv5wwVg3v4iW h/6Vm6JFGxKtrpAyBYKrtRmUAu7byoKZwWTWt3SWZkGvKWk0RqBsQQK9z8EJDN8k9Wim pph5oIQ4pKCDyltMrTyZMsHHQrxOaIQjx5qw/V8DgLTGZWEjtUXz3C+HUJgO2dRpV3Ma jGyUK5SFCjg1lJMA2qDXWXFEmdBR5qnEfdqeRhDFQxSgLMY2od0M5cjSbe0jvJrDfhf7 GAwdE09KKptAFtcq7/zHIBcxOkCNe1Kq7iaagoBbWHnBbuwDVKe3qPf4LMbh3jtxUDjC Tfww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GjqLB3n/3wM9GLzr63LISYPuPKRe45txi1u/PioJ9As=; fh=nK/B2gIzvYPsKU0sJgdKEVdz5eoE00hHt727sEimwsQ=; b=sPDJz55Gl0O4NNwasSlskGdapkScq0sDMEGZUGRQU1XN19yvdow6KmduEUxm2jd3iP 0oGfDsf1CJn5vVt01CsbqimBA3nEf8RTHmTmjlhPZXXhmbirmqnIgKX4j3KwGFLtojER wkmV4GJLbW89APqfYMprFOHod5QDBa7qCtXueO7qYyuC5in3qyY+i2Fos/YfGcEelCoB /XYutnx1tMNihlmcT0xVnIxiqwnKjDwhUzkt5XytmLcHg91ZOlGc+ollD4Ngp55Rkta/ obh871lj12cMgb/oBwzTkzFcNLqTdHfcqQY4bgHcB0l+THOdoL/6sikGNnvoupRzcMKF jz7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@posteo.net header.s=2017 header.b=fzzKsHIs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.net Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id p123-20020a252981000000b00d9cc1ed345bsi10275933ybp.162.2023.10.25.03.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 03:52:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@posteo.net header.s=2017 header.b=fzzKsHIs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.net Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 3248380BB216; Wed, 25 Oct 2023 03:52:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234481AbjJYKvx (ORCPT + 26 others); Wed, 25 Oct 2023 06:51:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbjJYKvo (ORCPT ); Wed, 25 Oct 2023 06:51:44 -0400 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C25AC for ; Wed, 25 Oct 2023 03:51:41 -0700 (PDT) Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 95331240106 for ; Wed, 25 Oct 2023 12:51:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698231098; bh=jTnT/chsOtzfuw6NmZuyV4Fm9a93YfuqFYlLWZRZY3Q=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=fzzKsHIsQKX/JSmLFfIJeoRn8YWtpU7rmdb4t43E50CthymzErREjllwxUr7GDapJ L1O5yv8kPfS1KCMDdfvOLNeCmiYnabQ69zM3uHpF2MAxMPWO4/KGmBMcV08n1z6c1H E5CytkHMvHIXBBiq8eu5zExYkJZsciwAczgZsCfe6ccS2yxeJE4iLJ+JtxqeDvWJYB LLGOJPQxXHl7IIbY5bR+/PuwpQ/W2CMfm29BnkgfnPgJ0H6Raib5xTAxommQpy7H2u yY6bTq1sCK2iGyUf57eP9v0XYKBdXUqj3qdJsUEBwLLvfBWejwR+29PKdyGb6/N902 9jfmsaRsqLZfA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFm2J70n8z9rxH; Wed, 25 Oct 2023 12:51:36 +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 v3 1/3] nvme-auth: auth success1 msg always includes resp Date: Wed, 25 Oct 2023 10:51:23 +0000 Message-Id: <20231025105125.134443-2-shiftee@posteo.net> In-Reply-To: <20231025105125.134443-1-shiftee@posteo.net> References: <20231025105125.134443-1-shiftee@posteo.net> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 25 Oct 2023 03:52:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780724418082085129 X-GMAIL-MSGID: 1780724418082085129 In cases where RVALID is false, the response is still transmitted, but is cleared to zero. Relevant extract from the spec: Response R2, if valid (i.e., if the RVALID field is set to 01h), cleared to 0h otherwise Signed-off-by: Mark O'Donovan Reviewed-by: Hannes Reinecke Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig --- v1: used incorrect prefix nvme-tcp v2: rebase on latest git drivers/nvme/host/auth.c | 5 +---- include/linux/nvme.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c index 064592a5d546..e0fc33d41baa 100644 --- a/drivers/nvme/host/auth.c +++ b/drivers/nvme/host/auth.c @@ -339,10 +339,7 @@ static int nvme_auth_process_dhchap_success1(struct nvme_ctrl *ctrl, struct nvme_dhchap_queue_context *chap) { struct nvmf_auth_dhchap_success1_data *data = chap->buf; - size_t size = sizeof(*data); - - if (chap->s2) - size += chap->hash_len; + size_t size = sizeof(*data) + chap->hash_len; if (size > CHAP_BUF_SIZE) { chap->status = NVME_AUTH_DHCHAP_FAILURE_INCORRECT_PAYLOAD; diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 26dd3f859d9d..8d8df9c15b74 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -1722,7 +1722,7 @@ struct nvmf_auth_dhchap_success1_data { __u8 rsvd2; __u8 rvalid; __u8 rsvd3[7]; - /* 'hl' bytes of response value if 'rvalid' is set */ + /* 'hl' bytes of response value */ __u8 rval[]; };