From nobody Wed Oct 1 22:30:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD9B72C3248; Tue, 30 Sep 2025 22:17:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759270657; cv=none; b=hNklex4Gw5qVd4Q7RFvEc5cclWO84cD2bnQywD54qeRWUmOF+L8e/RgIYT3+1ghCNXZAb3BFVz29gg+lLHENn9uAHelOZ6hKQRzi4A4Za2rTqMYNvr5uRP0Ml/4cBhE0CB0E1WMRxlVHC4IYUSopCZO4iCz7mbdfC32Tc7ZaC5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759270657; c=relaxed/simple; bh=EMTP6peT35/eDm04XvGtCtpIeLhsm4XB0PX1HnX9bc4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Arw7ENLuaQy9obs8XyKo2B2Bj6Js8E3EsZEkTsXAbUa9aDTK9gZXFgm6JIyzBR9YsFMQKbx07odDlcaN9tsbdQa2g4HRdIEXZIG5EgoEZ3I/gS0bTZT7cWewyK9mG+U5yp3sq2TzUxrueSM+kW0ORicqo5D5F9blLlS7rMh4YnM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hBl1zuU1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hBl1zuU1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FBA7C4CEF0; Tue, 30 Sep 2025 22:17:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759270657; bh=EMTP6peT35/eDm04XvGtCtpIeLhsm4XB0PX1HnX9bc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hBl1zuU1F0U9i5tsniPalSfOHyF1A7TYXur7jaMusXgMLJ0W3vRValP340wR++tvP 2lfdPwG8L/c+vTzJfhOHP5IqRDlaLm+KoHL0QrWkd29+RNuKF73iwiTMDmZhveIrPk PdwwdqxuALqTNaThPO9FMlux3duj1tLhorVbLiov8S0PYLiMKTEFp5q+oD2KJYY7Wy zWYa2I9gLoOWD1rxO3i6YmycMWWfDTQj/7P7tvgN2cT1xwSRmOoR/iCgLK7XgG+K5n lUhvkqEqQZXbcU67vsCeg+bivkVuEm1NLToEW6Ee1UwetWthhyo58/RvG/CVpxTzkE 2zN7QCqu7KPMg== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: dpsmith@apertussolutions.com, ross.philipson@oracle.com, Jarkko Sakkinen , Jonathan McDowell , Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , James Bottomley , Mimi Zohar , linux-kernel@vger.kernel.org (open list), keyrings@vger.kernel.org (open list:KEYS/KEYRINGS), linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM) Subject: [PATCH v4 5/9] tpm2-sessions: Unmask tpm_buf_append_hmac_session() Date: Wed, 1 Oct 2025 01:17:03 +0300 Message-Id: <20250930221707.1373912-6-jarkko@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250930221707.1373912-1-jarkko@kernel.org> References: <20250930221707.1373912-1-jarkko@kernel.org> 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: Jarkko Sakkinen Open code tpm_buf_append_hmac_session_opt() in order to unmask the code paths in the call sites of tpm_buf_append_hmac_session(). Signed-off-by: Jarkko Sakkinen Reviewed-by: Jonathan McDowell --- v4: - Fixed typo in short summary. v3: - No changes. v2: - Uncorrupt the patch. --- drivers/char/tpm/tpm2-cmd.c | 14 +++++++++++--- include/linux/tpm.h | 23 ----------------------- security/keys/trusted-keys/trusted_tpm2.c | 12 ++++++++++-- 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index bf8294e3d8f2..254003e5dd8b 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -257,9 +257,17 @@ int tpm2_get_random(struct tpm_chip *chip, u8 *dest, s= ize_t max) =20 do { tpm_buf_reset(&buf, TPM2_ST_SESSIONS, TPM2_CC_GET_RANDOM); - tpm_buf_append_hmac_session_opt(chip, &buf, TPM2_SA_ENCRYPT - | TPM2_SA_CONTINUE_SESSION, - NULL, 0); + if (tpm2_chip_auth(chip)) { + tpm_buf_append_hmac_session(chip, &buf, + TPM2_SA_ENCRYPT | + TPM2_SA_CONTINUE_SESSION, + NULL, 0); + } else { + offset =3D buf.handles * 4 + TPM_HEADER_SIZE; + head =3D (struct tpm_header *)buf.data; + if (tpm_buf_length(&buf) =3D=3D offset) + head->tag =3D cpu_to_be16(TPM2_ST_NO_SESSIONS); + } tpm_buf_append_u16(&buf, num_bytes); tpm_buf_fill_hmac_session(chip, &buf); err =3D tpm_transmit_cmd(chip, &buf, diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 5b44222a36c4..e3c65d33e041 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -536,29 +536,6 @@ void tpm_buf_append_hmac_session(struct tpm_chip *chip= , struct tpm_buf *buf, int passphraselen); void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf, u8 *passphrase, int passphraselen); -static inline void tpm_buf_append_hmac_session_opt(struct tpm_chip *chip, - struct tpm_buf *buf, - u8 attributes, - u8 *passphrase, - int passphraselen) -{ - struct tpm_header *head; - int offset; - - if (tpm2_chip_auth(chip)) { - tpm_buf_append_hmac_session(chip, buf, attributes, passphrase, passphras= elen); - } else { - offset =3D buf->handles * 4 + TPM_HEADER_SIZE; - head =3D (struct tpm_header *)buf->data; - - /* - * If the only sessions are optional, the command tag must change to - * TPM2_ST_NO_SESSIONS. - */ - if (tpm_buf_length(buf) =3D=3D offset) - head->tag =3D cpu_to_be16(TPM2_ST_NO_SESSIONS); - } -} =20 #ifdef CONFIG_TCG_TPM2_HMAC =20 diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trus= ted-keys/trusted_tpm2.c index e165b117bbca..c414a7006d78 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -482,8 +482,10 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, struct trusted_key_options *options, u32 blob_handle) { + struct tpm_header *head; struct tpm_buf buf; u16 data_len; + int offset; u8 *data; int rc; =20 @@ -518,8 +520,14 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, tpm2_buf_append_auth(&buf, options->policyhandle, NULL /* nonce */, 0, 0, options->blobauth, options->blobauth_len); - tpm_buf_append_hmac_session_opt(chip, &buf, TPM2_SA_ENCRYPT, - NULL, 0); + if (tpm2_chip_auth(chip)) { + tpm_buf_append_hmac_session(chip, &buf, TPM2_SA_ENCRYPT, NULL, 0); + } else { + offset =3D buf.handles * 4 + TPM_HEADER_SIZE; + head =3D (struct tpm_header *)buf.data; + if (tpm_buf_length(&buf) =3D=3D offset) + head->tag =3D cpu_to_be16(TPM2_ST_NO_SESSIONS); + } } =20 tpm_buf_fill_hmac_session(chip, &buf); --=20 2.39.5