From mboxrd@z Thu Jan 1 00:00:00 1970 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 0ACCB296BB5; Mon, 1 Dec 2025 22:46:24 +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=1764629185; cv=none; b=EgEq75iJO9AYdiG/CGXEF7DjVJKeunjCRMlbh9yvnAgfnEV5VcWnkIeRJ/z4UeYyvtFKBSl5XI4dFBLS1pDOXVyRXpLoNHYskIwCSGTzfTgtplpVGUzgyzREd3SD6+RK17uXD5wxN6ZjOJD/dJbiamsP9jUbuUYTeTaiZ7tEHnA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764629185; c=relaxed/simple; bh=lgzJIxyw6/fGv4S6vguA3WAKPvQipuquULpWPkSgse4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T/snJIF4Bg7fQ4FtGXWFToYdYzCW4FrvBR7DcDRk0Oq65h8u53zbGk02PVseLayvMbDWSMyldAHkmrPuXewbIcV7qwF1lkI6w74jsc5CpTvtLybN8Df16jriztQQZmtJXJ+2ZXshcfIdokhy12l2+tfJ9omFH1dSVIGbvLNnRok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lyQXI0Gs; 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="lyQXI0Gs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0244BC4CEF1; Mon, 1 Dec 2025 22:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764629184; bh=lgzJIxyw6/fGv4S6vguA3WAKPvQipuquULpWPkSgse4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lyQXI0GsR6pQ2lFfghA38IX90Nrmlb2AFaTdpTFcGqJFDWWCl6O+hYGvaRjKOfhjB UBQjx/Dpt+ZEdGJV8u0v6Mz7Uxs6zkGFkgNLOB3CJ+GNMfGxDD9lvu6SwJWI8Y0KXG k+siTPLawYHkTSQkIm31b6cts6LVvRzThLsEiq00vvhyOWVvEFLCbuU36sQacP16So SOfUE2f6ga8bHgWDvFMrw8uZh9mOBhFDj6SMJMM9toFTJp+K+AU0qI8IaBt5qkSTf2 gz+qO84MWPp1WRCa70moCyuNGe8bxfrvSdM+A0sYgC8dxGWfoHB7I+rhVwmWqc2zCJ c55CvSobHcRGA== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Jarkko Sakkinen , Jonathan McDowell , Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , James Bottomley , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org (open list), keyrings@vger.kernel.org (open list:KEYS-TRUSTED), linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM) Subject: [PATCH 4/4] tpm2-sessions: Open code tpm_buf_append_hmac_session() Date: Tue, 2 Dec 2025 00:45:52 +0200 Message-ID: <20251201224554.1717104-5-jarkko@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251201224554.1717104-1-jarkko@kernel.org> References: <20251201224554.1717104-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jarkko Sakkinen Open code 'tpm_buf_append_hmac_session_opt' to the call site, as it only masks a call sequence and does otherwise nothing particularly useful. 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 f1e9c35f13a2..94cb887cb4a9 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -270,9 +270,17 @@ int tpm2_get_random(struct tpm_chip *chip, u8 *dest, size_t max) 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 = buf.handles * 4 + TPM_HEADER_SIZE; + head = (struct tpm_header *)buf.data; + if (tpm_buf_length(&buf) == offset) + head->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS); + } tpm_buf_append_u16(&buf, num_bytes); err = tpm_buf_fill_hmac_session(chip, &buf); if (err) { diff --git a/include/linux/tpm.h b/include/linux/tpm.h index e3a6e2fb41a7..a93df0efebe4 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -535,29 +535,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, passphraselen); - } else { - offset = buf->handles * 4 + TPM_HEADER_SIZE; - head = (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) == offset) - head->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS); - } -} #ifdef CONFIG_TCG_TPM2_HMAC diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index 7672a4376dad..e6b95111ac7d 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -494,8 +494,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; @@ -532,8 +534,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 = buf.handles * 4 + TPM_HEADER_SIZE; + head = (struct tpm_header *)buf.data; + if (tpm_buf_length(&buf) == offset) + head->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS); + } } rc = tpm_buf_fill_hmac_session(chip, &buf); -- 2.52.0