From nobody Mon Apr 6 20:30:47 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 672E763CB for ; Wed, 18 Mar 2026 00:47:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773794829; cv=none; b=nBsy2gjmvuPVJNjrJPd+eobeddHwJhdode/Glmp3qlcVbcMVUqXfubQ0AMorRwV6cXeLzxKMzlMPrhe2nNtJz4SvFAzYJ24TGNm6wZtm3lI+uP9G7WhTtPn9QT2wSJKM3xYEJYNp6q8xiOh+7VYujbprwcZj0Tsc9JdeuZSmppU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773794829; c=relaxed/simple; bh=vh035OXO2hR2X4uYK3RaF/MTEg3mSjbfHtb0p6VVByQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WM/B28UnrHdiZfv1CtcPyIJvdPcbBXddcxQHIKed/ay6eV8/U/o9LsCrsZiahcv+Y0c54aoEPY1HKI7tJi6Nit+qDkmnWANu6c5on18kqs0yW3oPZuvF1ZajvvKdw8RtzyMqAgucFk0ZAJmkHDcRsm6+6awdycQHZ/ZVmqXp/XU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iAIT5FKD; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iAIT5FKD" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ab46931cf1so3686455ad.0 for ; Tue, 17 Mar 2026 17:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773794828; x=1774399628; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kAySL08WZH4li/cvsK0A8VcXPldu+e2SzbCzG56Tn7Y=; b=iAIT5FKDcbtyyunMRLSn+/qL8AopOuxLvQjNfGYyp9p5juGH0BL5zp07aXBlyh9TDh cKUJNf8wiWQAD7S/uPwZmqfeYSevVcOVFlNbbz1L3Sl9fxGLZ4cmNAx0ky34bbmEsYK1 u9ztMfyqGONMmRd0JoNCISYrbCKt442vfR3VNTgA6kEMyEKuFiI3s0hbd5Os3Fd2RmTe +53Qf6d6VrDnUQbEcp6sny23rNXOuiby3p5dHtPDDCWxmLk0GIHtuN+NQzzEN4SC96Oc 8GzTMj7UITzm87sSO+mHBGN+u6FUP3LDHFWYjkJbXhuWab5UfH8D7FHZ4iPxRVo4ZWqC Wsmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773794828; x=1774399628; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kAySL08WZH4li/cvsK0A8VcXPldu+e2SzbCzG56Tn7Y=; b=ehtnm2CinXl9jBXq9M719SWYkvoNOCOHcHPdoosCDgIHsFZb9DaGVpEhY0w0GeNrnW bToKLrj2sf4B9V9TjprpjVaJEvA8XnLrJ+cW6HSYg328RsvJW17lsZ8vbqECl2ovDSgV 5SKCGoftrzBqG74aqoPWkKe52huSnFsK9qEk1b2q3fSvt2rbgG5kDmXOnP4dzsrYyOjW RMO5QG01BtKs5KlJM4V9dWEc5kKFdE76ZsP8sVg5HYayJc4yXDHhT9DBrNY4WB84MzI4 7JZc0mkE8zeFpWox7UhUSJ2Zu017MaXUEx8jkRE+QKsyu6YZ7H8RpxpmSKvBQxBMv0tY MLzg== X-Forwarded-Encrypted: i=1; AJvYcCUXN0L8ZrpCxpklf8gdfQHxz64jgsFnmkP5UA/1qR013AA0jJ9647hLl0a32H8pHgT4zrG0Su8VnOFLz1s=@vger.kernel.org X-Gm-Message-State: AOJu0YwD8PUdqBDygnPGf55vldbvz9+F8VWgYF05vVbaO6MTA6jdugz0 r3gpcmdvIQJamm3Wv8v2PUsohSTYin22xfhAk6YOsYo/ZNIhmR8amN1l X-Gm-Gg: ATEYQzwhi9ye/+3yd4Z6VLDFxe2UyeMJxuQbaOI1tJbQTUajjEcUL0EkeoZbvHYf+BR sbg3wvgOfS9Os/Yg1UPfYMP7yJEjv6v+OBa1sJ6bIBYEczabsA262DcFwkB5XAgQ3R3BrhISNoN OuPNSFX9cb6iOtD5WaIJevoepukIbOYVjv94seEuceb3biZfT0+Tyej70OkQTONgw1lGMYKW9Ef AWXOuNxHUpnRzZzt+JltVAA9nmS6p0PdzwM2Pq3X4sxBvxdjTUzC9hlxHUd6waV64/jVGQM/lXJ aF5OqszkUAHWxKly/wLppB3NKsqMPQSmXeeCOw9bPzi2J0RZZQhVWrtxJR3mCmylK1Vi1PGwNUP 1ec823RNCm80MC5fhAqQrKgBkqCDMQ88whN6ElO5AumBIcF1fdo5GpZ7Vg/tJn4Z1Tm0t8Dv2s0 v4jZaC6HiVJ0dp5LKgbAHVCDTy7cgv0daGELpJWUpvGw== X-Received: by 2002:a17:903:185:b0:2ae:5d90:9d95 with SMTP id d9443c01a7336-2b06e0fb884mr14506645ad.14.1773794827625; Tue, 17 Mar 2026 17:47:07 -0700 (PDT) Received: from toolbx.alistair23.me ([2403:581e:fdf9:0:6209:4521:6813:45b7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b06e5ef3c6sm7406935ad.43.2026.03.17.17.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 17:47:07 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: hare@suse.de, kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Cc: alistair23@gmail.com, Alistair Francis , Kamaljit Singh Subject: [PATCH v3] nvme-auth: Don't propose NVME_AUTH_DHGROUP_NULL with SC_C Date: Wed, 18 Mar 2026 10:46:58 +1000 Message-ID: <20260318004658.3681991-1-alistair.francis@wdc.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alistair Francis Section 8.3.4.5.2 of the NVMe 2.1 base spec states that """ The 00h identifier shall not be proposed in an AUTH_Negotiate message that requests secure channel concatenation (i.e., with the SC_C field set to a non-zero value). """ We need to ensure that we don't set the NVME_AUTH_DHGROUP_NULL idlist if SC_C is set. Signed-off-by: Kamaljit Singh Signed-off-by: Alistair Francis Reviewed-by: Hannes Reinecke --- v3: - Ensure chap->sc_c is set before the if statement v2: - Use a macro for Diffie-Hellman Group Identifier List Offset - Use a pointer for data->auth_protocol[0].dhchap.idlist drivers/nvme/host/auth.c | 26 ++++++++++++++------------ include/linux/nvme.h | 2 ++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c index 405e7c03b1cf..f9efed08997c 100644 --- a/drivers/nvme/host/auth.c +++ b/drivers/nvme/host/auth.c @@ -125,6 +125,8 @@ static int nvme_auth_set_dhchap_negotiate_data(struct n= vme_ctrl *ctrl, { struct nvmf_auth_dhchap_negotiate_data *data =3D chap->buf; size_t size =3D sizeof(*data) + sizeof(union nvmf_auth_protocol); + u8 dh_list_offset =3D DH_GID_LIST_OFFSET; + u8 *idlist =3D data->auth_protocol[0].dhchap.idlist; =20 if (size > CHAP_BUF_SIZE) { chap->status =3D NVME_AUTH_DHCHAP_FAILURE_INCORRECT_PAYLOAD; @@ -141,21 +143,21 @@ static int nvme_auth_set_dhchap_negotiate_data(struct= nvme_ctrl *ctrl, data->sc_c =3D NVME_AUTH_SECP_NEWTLSPSK; } else data->sc_c =3D NVME_AUTH_SECP_NOSC; + chap->sc_c =3D data->sc_c; data->napd =3D 1; data->auth_protocol[0].dhchap.authid =3D NVME_AUTH_DHCHAP_AUTH_ID; data->auth_protocol[0].dhchap.halen =3D 3; - data->auth_protocol[0].dhchap.dhlen =3D 6; - data->auth_protocol[0].dhchap.idlist[0] =3D NVME_AUTH_HASH_SHA256; - data->auth_protocol[0].dhchap.idlist[1] =3D NVME_AUTH_HASH_SHA384; - data->auth_protocol[0].dhchap.idlist[2] =3D NVME_AUTH_HASH_SHA512; - data->auth_protocol[0].dhchap.idlist[30] =3D NVME_AUTH_DHGROUP_NULL; - data->auth_protocol[0].dhchap.idlist[31] =3D NVME_AUTH_DHGROUP_2048; - data->auth_protocol[0].dhchap.idlist[32] =3D NVME_AUTH_DHGROUP_3072; - data->auth_protocol[0].dhchap.idlist[33] =3D NVME_AUTH_DHGROUP_4096; - data->auth_protocol[0].dhchap.idlist[34] =3D NVME_AUTH_DHGROUP_6144; - data->auth_protocol[0].dhchap.idlist[35] =3D NVME_AUTH_DHGROUP_8192; - - chap->sc_c =3D data->sc_c; + idlist[0] =3D NVME_AUTH_HASH_SHA256; + idlist[1] =3D NVME_AUTH_HASH_SHA384; + idlist[2] =3D NVME_AUTH_HASH_SHA512; + if (chap->sc_c =3D=3D NVME_AUTH_SECP_NOSC) + idlist[dh_list_offset++] =3D NVME_AUTH_DHGROUP_NULL; + idlist[dh_list_offset++] =3D NVME_AUTH_DHGROUP_2048; + idlist[dh_list_offset++] =3D NVME_AUTH_DHGROUP_3072; + idlist[dh_list_offset++] =3D NVME_AUTH_DHGROUP_4096; + idlist[dh_list_offset++] =3D NVME_AUTH_DHGROUP_6144; + idlist[dh_list_offset++] =3D NVME_AUTH_DHGROUP_8192; + data->auth_protocol[0].dhchap.dhlen =3D dh_list_offset - DH_GID_LIST_OFFS= ET; =20 return size; } diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 655d194f8e72..bd540ef33b63 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -2332,4 +2332,6 @@ enum nvme_pr_change_ptpl { =20 #define NVME_PR_IGNORE_KEY (1 << 3) =20 +#define DH_GID_LIST_OFFSET 30 + #endif /* _LINUX_NVME_H */ --=20 2.53.0