All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: linux-integrity@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>,
	keyrings@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v5 11/17] tpm: export the context save and load commands
Date: Mon, 27 Nov 2023 14:08:48 -0500	[thread overview]
Message-ID: <20231127190854.13310-12-James.Bottomley@HansenPartnership.com> (raw)
In-Reply-To: <20231127190854.13310-1-James.Bottomley@HansenPartnership.com>

The TPM2 session HMAC and encryption handling code needs to save and
restore a single volatile context for the elliptic curve version of
the NULL seed, so export the APIs which do this for internal use.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>

---

v5: add review
---
 drivers/char/tpm/tpm.h        | 4 ++++
 drivers/char/tpm/tpm2-space.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 61445f1dc46d..cbc9d1e2974d 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -312,6 +312,10 @@ int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, void *buf,
 		      size_t *bufsiz);
 int tpm_devs_add(struct tpm_chip *chip);
 void tpm_devs_remove(struct tpm_chip *chip);
+int tpm2_save_context(struct tpm_chip *chip, u32 handle, u8 *buf,
+		      unsigned int buf_size, unsigned int *offset);
+int tpm2_load_context(struct tpm_chip *chip, u8 *buf,
+		      unsigned int *offset, u32 *handle);
 
 void tpm_bios_log_setup(struct tpm_chip *chip);
 void tpm_bios_log_teardown(struct tpm_chip *chip);
diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c
index 363afdd4d1d3..24479a81c23c 100644
--- a/drivers/char/tpm/tpm2-space.c
+++ b/drivers/char/tpm/tpm2-space.c
@@ -68,8 +68,8 @@ void tpm2_del_space(struct tpm_chip *chip, struct tpm_space *space)
 	kfree(space->session_buf);
 }
 
-static int tpm2_load_context(struct tpm_chip *chip, u8 *buf,
-			     unsigned int *offset, u32 *handle)
+int tpm2_load_context(struct tpm_chip *chip, u8 *buf,
+		      unsigned int *offset, u32 *handle)
 {
 	struct tpm_buf tbuf;
 	struct tpm2_context *ctx;
@@ -119,8 +119,8 @@ static int tpm2_load_context(struct tpm_chip *chip, u8 *buf,
 	return 0;
 }
 
-static int tpm2_save_context(struct tpm_chip *chip, u32 handle, u8 *buf,
-			     unsigned int buf_size, unsigned int *offset)
+int tpm2_save_context(struct tpm_chip *chip, u32 handle, u8 *buf,
+		      unsigned int buf_size, unsigned int *offset)
 {
 	struct tpm_buf tbuf;
 	unsigned int body_size;
-- 
2.35.3


  parent reply	other threads:[~2023-11-27 19:15 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-27 19:08 [PATCH v5 00/17] add integrity and security to TPM2 transactions James Bottomley
2023-11-27 19:08 ` [PATCH v5 01/17] tpm: Remove unused tpm_buf_tag() James Bottomley
2023-11-27 19:08 ` [PATCH v5 02/17] tpm: Remove tpm_send() James Bottomley
2023-11-27 19:08 ` [PATCH v5 03/17] tpm: Move buffer handling from static inlines to real functions James Bottomley
2023-11-27 19:08 ` [PATCH v5 04/17] tpm: Update struct tpm_buf documentation comments James Bottomley
2023-11-27 19:08 ` [PATCH v5 05/17] tpm: Store the length of the tpm_buf data separately James Bottomley
2023-11-27 19:08 ` [PATCH v5 06/17] tpm: TPM2B formatted buffers James Bottomley
2023-11-27 19:08 ` [PATCH v5 07/17] tpm: Add tpm_buf_read_{u8,u16,u32} James Bottomley
2023-11-27 19:08 ` [PATCH v5 08/17] KEYS: trusted: tpm2: Use struct tpm_buf for sized buffers James Bottomley
2023-11-27 19:08 ` [PATCH v5 09/17] crypto: lib - implement library version of AES in CFB mode James Bottomley
2023-11-27 19:08 ` [PATCH v5 10/17] tpm: add buffer function to point to returned parameters James Bottomley
2023-11-27 19:08 ` James Bottomley [this message]
2023-11-27 19:08 ` [PATCH v5 12/17] tpm: Add full HMAC and encrypt/decrypt session handling code James Bottomley
2023-12-07  4:52   ` Jarkko Sakkinen
2023-12-07 23:09     ` James Bottomley
2023-12-13 16:42       ` Jarkko Sakkinen
2023-11-27 19:08 ` [PATCH v5 13/17] tpm: add hmac checks to tpm2_pcr_extend() James Bottomley
2023-11-27 19:08 ` [PATCH v5 14/17] tpm: add session encryption protection to tpm2_get_random() James Bottomley
2023-11-27 19:08 ` [PATCH v5 15/17] KEYS: trusted: Add session encryption protection to the seal/unseal path James Bottomley
2023-11-27 19:08 ` [PATCH v5 16/17] tpm: add the null key name as a sysfs export James Bottomley
2023-12-07 20:48   ` Jarkko Sakkinen
2023-12-15  3:34   ` Jarkko Sakkinen
2023-11-27 19:08 ` [PATCH v5 17/17] Documentation: add tpm-security.rst James Bottomley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231127190854.13310-12-James.Bottomley@HansenPartnership.com \
    --to=james.bottomley@hansenpartnership.com \
    --cc=ardb@kernel.org \
    --cc=jarkko@kernel.org \
    --cc=keyrings@vger.kernel.org \
    --cc=linux-integrity@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.