From nobody Thu Oct 2 05:03:19 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 8DAC9280CFA; Mon, 22 Sep 2025 11:50:23 +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=1758541823; cv=none; b=YQtZCM8hedqHckMuNfG5UebyzYvR1n+xYE4miprVpCEzJyD0D8cc3mn5mueTB4rv7G/OawrHPatE6t27kfQJXJR/C66tiTcKJEbdNvV0JNPnBbrw+0EeZgmQsMVe5M71SyaUsYyABgeVL1qpbDfwvA1JsSZTKStiMfo7LsGf10M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758541823; c=relaxed/simple; bh=M4vWG+Jid2SxNiuuHydQTaCp6c30nOkRvRWQ7YmQsis=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=bsSY8vUam6AmxTnH2tiXBGiUJhI5oDB4E0SkIBPx2T15ecQ6yq2x8Emh3rJBa7cEJy6B5CX42byi3r0OrL4zCKg4hXYEYaFrla2H4e5Vadd9tWQ/iNuJIGaVbrmo5hEEvbRCMBXSr3sbJVsj5n+zj1VSv71B2X1bmSp41YLD9PU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mG8lB6bW; 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="mG8lB6bW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CABAFC4CEF0; Mon, 22 Sep 2025 11:50:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758541823; bh=M4vWG+Jid2SxNiuuHydQTaCp6c30nOkRvRWQ7YmQsis=; h=From:To:Cc:Subject:Date:From; b=mG8lB6bWUBvbm/cp9s1RLUSdeIoySbwnwxXp2WoebgTOtuBlHyqlHsUEGTjg8rQue OnQ/VO5E/nfHdanxxI9WV2T3RceHlctyBuznScmZcn/z+nm/Na2f/rCF2X7CdtaPsj SuqDo3wTlSkVC8TN+zZQcEt0MPaUKn4J4saxH4WHXpn8211r4snoToH2AgeCJqZYQN Sqa5ZB1h2z4ohZHN9vJhwlEdpZaJcphvIFhLL+3Q0D9iX+3MU0JSopzZrsqh1F+0Eg ScphcNw4iTmf6FaM7HClitZvOrUQxbD504CnAHVdNxw6qxLpf0T2ji2OKZ0hJQh/BN 17CiHf2eOu7nw== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Jarkko Sakkinen , 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] tpm2-sessions: Remove unnecessary wrapper Date: Mon, 22 Sep 2025 14:50:09 +0300 Message-Id: <20250922115009.3053664-1-jarkko@kernel.org> X-Mailer: git-send-email 2.39.5 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() because it adds unnecessary disperancy to the call sites (and reduces the amount of code). Signed-off-by: Jarkko Sakkinen Reviewed-By: Jonathan McDowell --- 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 7d77f6fbc152..89e6169add88 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 667d290789ca..aaa407ddef21 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -534,29 +534,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 attributes, 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