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 917382DF6F8; Sat, 18 Oct 2025 11:18:01 +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=1760786281; cv=none; b=VvVPnOt8eEi2kmUkjUSykwk4B6AAJZEhwuiWOmLr22MRj/P3V7LcugT5uKYA6nCLdv75s+9DsFIFTj9v4qbJGplBXI5zfC8YWVi32flfB+k+pbJChWNIYdKqksX7nzh7twOUYcMmxuoy8k4y1jLD/GuiRLCZbITAt/Pv43tUaLk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760786281; c=relaxed/simple; bh=JvR6WwCRiFJoxPQpA9VtseDrvkuHtvTHBHKtiwkz8kU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B4akjcLHT3P4SHMfnAbQRzCNKR3lkxFTQuLIl6MKMaZ5XOMrXpJ0k8iC0KEQxds9ff9h+h9orZHiczXJg6NzPBcJlcQGTVlbtnd+HrCOgMQwq/6UwfTPsKvqsrs4sage0SivLV6UdyxiM5WXuRw5pnthtkBXjPdj3u4S0lfISoU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NRPWxs9f; 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="NRPWxs9f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFFADC4CEFE; Sat, 18 Oct 2025 11:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760786281; bh=JvR6WwCRiFJoxPQpA9VtseDrvkuHtvTHBHKtiwkz8kU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NRPWxs9fqFz72IcR2HXUPphidjf09PQLK6dnRRTIQ9c2RsVa+LCA0/VwcW8wZIX9z Lc0P9IDX97jY3rq2B0/gtjC8bkAf+2EPbbiJ0x6xORpsZMvgqHtSlbxIEE0k9C+1Lb m0p+8o2e9rMbksDQ1pYAp0DSkUtcPxQTN3PhQri6Ilk+0rnF2BPUfIWZqMJRnfBG0y zkE/6Vdx4kwKSCx5vgzbiuW/65Vy5YrZtLIkHLlnYyai/bU6boX5uxFNxG2fP+lrFz dvUo8T68rPb3BGeKICXkSoEuRY+6o2N/o87f11ZBTbQg3qioEBU98sBxLCKCk9oZv3 3x6I4OuuUEZkA== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: keyring@vger.kernel.org, dpsmith@apertussolutions.com, ross.philipson@oracle.com, Jonathan McDowell , Roberto Sassu , Stefano Garzarella , 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, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v6 06/10] tpm2-sessions: Unmask tpm_buf_append_hmac_session() Date: Sat, 18 Oct 2025 14:17:21 +0300 Message-Id: <20251018111725.3116386-7-jarkko@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251018111725.3116386-1-jarkko@kernel.org> References: <20251018111725.3116386-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@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() 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 --- v6: - No changes. v5: - No changes. 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, 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); tpm_buf_fill_hmac_session(chip, &buf); err = tpm_transmit_cmd(chip, &buf, diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 004680757923..973458a38250 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 1cd00aad033a..a8cc18d6e9f0 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -479,8 +479,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; @@ -515,8 +517,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); + } } tpm_buf_fill_hmac_session(chip, &buf); -- 2.39.5