From nobody Tue Jun 16 03:49:02 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 4BBEE283FEA for ; Wed, 15 Apr 2026 23:08:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776294518; cv=none; b=ISrLDoQbAw5JqGh9XNiesdlcvzbcfkrtj5AYt1KPAHJliZ877NiZXvHVBB327hnyOFSP8iFdGOLP49ofsEJ9NEgz5B0keVFYStrCHKGmoNbsthIJgWikg9/WH10fqqQe+pLm/iGKLunfFyybG1/aShnW6d6ADFvZnBPQM3EmRLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776294518; c=relaxed/simple; bh=9d/UE3Blr5Yp3QcYiindcJypGGdSxIObYrA7Kqs4U2A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=t5KPHq/HYiwUvECVQg6XVrD79HK5cUJCcRCH9guG35U302ZxAvoCdumXL96bopDVHrUU11XT6KqgOR/pN+vCL3xbOVqqWPsZwq1l0+IEaWuP47BXBkGbZuqFsK/5tTUOEF6jBOOyUIotiNybr4GQWIvfW3MeQZ1V+XerWZBVZD8= 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=n+lb0Enx; arc=none smtp.client-ip=209.85.210.172 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="n+lb0Enx" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-82f1bfc9b8fso2348302b3a.1 for ; Wed, 15 Apr 2026 16:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776294517; x=1776899317; 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=JsMMBm1WM41W4hIFWtgmHCtwETMF7jT3du1Isr8t+hk=; b=n+lb0EnxOLYHLgdtsx0magvvpgVS3UwqLpUM0Ks6qYlp43uHCd4Ka57cOb7/jq09j5 4S8mBrLWmxIH+uAreWgy2QSbVJ9sPjqHZgAKxSvShk4SORtIgOnU7C5jsGupT5jTD5LX YHYeBQC8TT9jc70wjlUj32JQlSlf/zz2SyZQhLEjZec61VRHeoTy1GLNqVZ+dFy9Pguo hmA0JYHptqVo9bEXOslq9eWkeJPV2FjvRfrnH3zzwOxw897WMxb0bB+LhucmmyMFHvAG 7+ifn3LH8sbYB05h+CZlVvI/lMpYgNYhuQPu6T2Nu3+bHPpOMmf+cwZ8ihrakN4aWIFB 5hWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776294517; x=1776899317; 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=JsMMBm1WM41W4hIFWtgmHCtwETMF7jT3du1Isr8t+hk=; b=oI2cTa2n0rb5fhKhQ4vLYJ/6hspalSO1GfGLtoWcE3Rn8OdPdQTCRZqtmDRTjESXXq Fg2hGfn3sBEggAgmXS6qWDrfP+BPqacSoVGsQAJvvWzAwJM0gzErvTKBsvkQ4Yqh+6de cS//6c90gb2hYBOpfVgybYardivyq/mhXLOySpazV4QPuiXG6VtHScmE7GoqsW5cA/lZ CJ8f/Eh0SVpbyaBt3BIL8GSSSzvvzYbSTFmKzQvSFzN1QBmMayHRUcjHbTeNdUUZpGOr q39TWsysoT/prY7QET/TaVWC3iUEfzuhkbz+D9Toi2eqYumyV52eNdnx3iyI37U6oZTx Xb7Q== X-Forwarded-Encrypted: i=1; AFNElJ+ip8NC+Aj7EETAXfuWT3av8pY9+DzMfCnWKMge64YV1jX3zwqbF39E8zJNx78YbtO8hNhUVNu1PYjy8ag=@vger.kernel.org X-Gm-Message-State: AOJu0YwiX+kFW99X2y8RXqWGhMXPfxzy7G83l9xRzCSqxwSgfmjBi/y5 sF6sK44wkYevrcvbOvzTC/51NP98euiSEd9XwshsigGolA7nEDJG1p6nkrswwA== X-Gm-Gg: AeBDiesvmUEJIypbnOhXM8IxGgUk3SqKYIi9miQHJ8nUYwTnD3fvoxH9le3fui7vDLU dobjimruymFMiXW/CjQM0dzxMmU+N8/8A1Vx81LiiHI0hEYN5cR/0Ek9YHJISbGOMXdt5KELX0s tA3zvQR3NDn+SqoIWaK7h+0UaYlBZc0XMeTjFBuhl3aKp7KN8sW/XTWEchbSTGI38MOVO75C1I0 Tb8XvKRyduW7O+mx7Jy0N8sJIRxXtPA0NDqUHqWetzCMSgfHXPotH0POEz9J/6h2LG5xutC27Aq z1Nbm6kgRDd+B2POnDu2Vo/jDB2wNDy2gtlKmRxJTdyUCKHlAvDaGjpenu2yX5bMHR7qGekpEC1 FRnneuLjqAxe+hYKt5riNIRQrVl973mTYCIq7ptcqu+KK15dYXEwiXoPDCBLTuoXToBCzld3Kg3 1HtljSPXDtQrkLWBqY0hISSbM5q2YFThjZzbEOc3JO7A== X-Received: by 2002:a05:6a00:a87:b0:82f:559d:ece3 with SMTP id d2e1a72fcca58-82f559df420mr8363404b3a.15.1776294516557; Wed, 15 Apr 2026 16:08:36 -0700 (PDT) Received: from toolbx.alistair23.me ([2403:581e:fdf9:0:6209:4521:6813:45b7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f67078605sm3376019b3a.15.2026.04.15.16.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 16:08:35 -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, kch@nvidia.com, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v2] nvme-auth: Include SC_C in RVAL controller hash Date: Thu, 16 Apr 2026 09:08:24 +1000 Message-ID: <20260415230824.2790058-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.5 of the NVMe Base Specification 2.1 describes what is included in the Response Value (RVAL) hash and SC_C should be included. Currently we are hardcoding 0 instead of using the correct SC_C value. Update the host and target code to use the SC_C when calculating the RVAL instead of using 0. Fixes: f50fff73d620 ("nvme: implement In-Band authentication") Signed-off-by: Alistair Francis Reviewed-by: Chris Leech --- v2: - Rebase using new nvme_auth_hmac_update() functions drivers/nvme/host/auth.c | 3 ++- drivers/nvme/target/auth.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c index bbedbe181c8a6..63f543e809985 100644 --- a/drivers/nvme/host/auth.c +++ b/drivers/nvme/host/auth.c @@ -535,11 +535,12 @@ static int nvme_auth_dhchap_setup_ctrl_response(struc= t nvme_ctrl *ctrl, put_unaligned_le16(chap->transaction, buf); nvme_auth_hmac_update(&hmac, buf, 2); =20 - memset(buf, 0, 4); + *buf =3D chap->sc_c; nvme_auth_hmac_update(&hmac, buf, 1); nvme_auth_hmac_update(&hmac, "Controller", 10); nvme_auth_hmac_update(&hmac, ctrl->opts->subsysnqn, strlen(ctrl->opts->subsysnqn)); + memset(buf, 0, 4); nvme_auth_hmac_update(&hmac, buf, 1); nvme_auth_hmac_update(&hmac, ctrl->opts->host->nqn, strlen(ctrl->opts->host->nqn)); diff --git a/drivers/nvme/target/auth.c b/drivers/nvme/target/auth.c index b34610e2f19d4..f032855b21477 100644 --- a/drivers/nvme/target/auth.c +++ b/drivers/nvme/target/auth.c @@ -402,11 +402,12 @@ int nvmet_auth_ctrl_hash(struct nvmet_req *req, u8 *r= esponse, put_unaligned_le16(req->sq->dhchap_tid, buf); nvme_auth_hmac_update(&hmac, buf, 2); =20 - memset(buf, 0, 4); + *buf =3D req->sq->sc_c; nvme_auth_hmac_update(&hmac, buf, 1); nvme_auth_hmac_update(&hmac, "Controller", 10); nvme_auth_hmac_update(&hmac, ctrl->subsys->subsysnqn, strlen(ctrl->subsys->subsysnqn)); + memset(buf, 0, 4); nvme_auth_hmac_update(&hmac, buf, 1); nvme_auth_hmac_update(&hmac, ctrl->hostnqn, strlen(ctrl->hostnqn)); nvme_auth_hmac_final(&hmac, response); --=20 2.53.0