All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: linux-integrity@vger.kernel.org
Cc: Ard Biesheuvel <ardb@kernel.org>,
	Jarkko Sakkinen <jarkko@kernel.org>,
	keyrings@vger.kernel.org
Subject: [PATCH 03/11] tpm: add cursor based buffer functions for response parsing
Date: Fri,  9 Dec 2022 11:06:03 -0500	[thread overview]
Message-ID: <20221209160611.30207-4-James.Bottomley@HansenPartnership.com> (raw)
In-Reply-To: <20221209160611.30207-1-James.Bottomley@HansenPartnership.com>

It's very convenient when parsing responses to have a cursor you
simply move over the response extracting the data.  Add such cursor
functions for the TPM unsigned integer types.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
 drivers/char/tpm/tpm-buf.c | 29 +++++++++++++++++++++++++++++
 include/linux/tpm.h        |  3 +++
 2 files changed, 32 insertions(+)

diff --git a/drivers/char/tpm/tpm-buf.c b/drivers/char/tpm/tpm-buf.c
index f1d48f22d4b4..046b00bf7a81 100644
--- a/drivers/char/tpm/tpm-buf.c
+++ b/drivers/char/tpm/tpm-buf.c
@@ -7,6 +7,8 @@
 #include <linux/module.h>
 #include <linux/tpm.h>
 
+#include <asm/unaligned.h>
+
 static int __tpm_buf_init(struct tpm_buf *buf)
 {
 	buf->data = (u8 *)__get_free_page(GFP_KERNEL);
@@ -155,3 +157,30 @@ void tpm_buf_append_2b(struct tpm_buf *buf, struct tpm_buf *tpm2b)
 	tpm_buf_reset_int(tpm2b);
 }
 EXPORT_SYMBOL_GPL(tpm_buf_append_2b);
+
+/* functions for unmarshalling data and moving the cursor */
+u8 tpm_get_inc_u8(const u8 **ptr)
+{
+	return *((*ptr)++);
+}
+EXPORT_SYMBOL_GPL(tpm_get_inc_u8);
+
+u16 tpm_get_inc_u16(const u8 **ptr)
+{
+	u16 val;
+
+	val = get_unaligned_be16(*ptr);
+	*ptr += sizeof(val);
+	return val;
+}
+EXPORT_SYMBOL_GPL(tpm_get_inc_u16);
+
+u32 tpm_get_inc_u32(const u8 **ptr)
+{
+	u32 val;
+
+	val = get_unaligned_be32(*ptr);
+	*ptr += sizeof(val);
+	return val;
+}
+EXPORT_SYMBOL_GPL(tpm_get_inc_u32);
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index f2d4dab6d832..f7cff1d114b0 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -335,6 +335,9 @@ void tpm_buf_append_u8(struct tpm_buf *buf, const u8 value);
 void tpm_buf_append_u16(struct tpm_buf *buf, const u16 value);
 void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value);
 void tpm_buf_append_2b(struct tpm_buf *buf, struct tpm_buf *tpm2b);
+u8 tpm_get_inc_u8(const u8 **ptr);
+u16 tpm_get_inc_u16(const u8 **ptr);
+u32 tpm_get_inc_u32(const u8 **ptr);
 
 /*
  * Check if TPM device is in the firmware upgrade mode.
-- 
2.35.3


  parent reply	other threads:[~2022-12-09 16:08 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-09 16:06 [PATCH 00/11] add integrity and security to TPM2 transactions James Bottomley
2022-12-09 16:06 ` [PATCH 01/11] tpm: move buffer handling from static inlines to real functions James Bottomley
2022-12-09 19:11   ` kernel test robot
2022-12-09 19:42   ` kernel test robot
2022-12-10  2:09   ` Jarkko Sakkinen
2022-12-11 20:01     ` James Bottomley
2022-12-12  0:52       ` Jarkko Sakkinen
2022-12-12  3:16         ` James Bottomley
2022-12-26 20:03           ` Jarkko Sakkinen
2022-12-09 16:06 ` [PATCH 02/11] tpm: add buffer handling for TPM2B types James Bottomley
2022-12-09 16:06 ` James Bottomley [this message]
2022-12-12  0:50   ` [PATCH 03/11] tpm: add cursor based buffer functions for response parsing Jarkko Sakkinen
2022-12-12  3:13     ` James Bottomley
2022-12-26 20:06       ` Jarkko Sakkinen
2022-12-09 16:06 ` [PATCH 04/11] tpm: add buffer function to point to returned parameters James Bottomley
2022-12-09 16:06 ` [PATCH 05/11] tpm: export the context save and load commands James Bottomley
2022-12-09 16:06 ` [PATCH 06/11] tpm: Add full HMAC and encrypt/decrypt session handling code James Bottomley
2022-12-09 16:15   ` James Bottomley
2022-12-09 19:42   ` kernel test robot
2022-12-09 20:32   ` kernel test robot
2022-12-09 16:06 ` [PATCH 07/11] tpm: add hmac checks to tpm2_pcr_extend() James Bottomley
2022-12-09 16:06 ` [PATCH 08/11] tpm: add session encryption protection to tpm2_get_random() James Bottomley
2022-12-09 16:06 ` [PATCH 09/11] KEYS: trusted: Add session encryption protection to the seal/unseal path James Bottomley
2022-12-09 16:06 ` [PATCH 10/11] tpm: add the null key name as a sysfs export James Bottomley
2022-12-09 16:06 ` [PATCH 11/11] Documentation: add tpm-security.rst James Bottomley
2022-12-10  4:27 [PATCH 06/11] tpm: Add full HMAC and encrypt/decrypt session handling code kernel test robot
2022-12-10  5:17 ` Dan Carpenter
2022-12-11 20:05 ` 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=20221209160611.30207-4-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.