From: Jarkko Sakkinen <jarkko@kernel.org>
To: David Howells <dhowells@redhat.com>
Cc: keyrings@vger.kernel.org, linux-integrity@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org,
Alec Brown <alec.r.brown@oracle.com>,
"Daniel P. Smith" <dpsmith@apertussolutions.com>,
Eric Biggers <ebiggers@kernel.org>,
James Bottomley <James.Bottomley@hansenpartnership.com>,
James Morris <jmorris@namei.org>, Jason Gunthorpe <jgg@ziepe.ca>,
Jonathan McDowell <noodles@earth.li>,
Matthew Garrett <mjg59@srcf.ucam.org>,
Mimi Zohar <zohar@linux.ibm.com>,
Paul Moore <paul@paul-moore.com>, Peter Huewe <peterhuewe@gmx.de>,
Roberto Sassu <roberto.sassu@huawei.com>,
Ross Philipson <ross.philipson@gmail.com>,
"Serge E. Hallyn" <serge@hallyn.com>
Subject: Re: [PATCH v2 0/4] Unsorted tpm2-sessions improvements
Date: Mon, 16 Nov 2026 02:04:00 +0200 [thread overview]
Message-ID: <avpIcBVKGFikTkAN@kernel.org> (raw)
In-Reply-To: <avpFt2HzpKXN_uY5@kernel.org>
On Mon, Nov 16, 2026 at 01:52:28AM +0200, Jarkko Sakkinen wrote:
> On Mon, Nov 16, 2026 at 01:43:45AM +0200, Jarkko Sakkinen wrote:
> > On Mon, Nov 16, 2026 at 01:31:52AM +0200, Jarkko Sakkinen wrote:
> > > v2:
> > >
> > > - Based on Sashiko feedback I changed "offset += tpm_buf_read_u16()" into
> > > "rc = tpm_buf_read_u16(...)" and "offset += rc". I'm convinced that this
> > > was necessary but since it does not have a cost, at least this should
> > > mute Sashiko.
> >
> > No further Sashiko complains.
>
> tpm_buf_read*() really should update the offset on success, and be
> fallible calls. Overflow-flag, and eventual failure makes more
> sense when building commands.
I.e.
diff --git a/drivers/char/tpm/tpm-buf.c b/drivers/char/tpm/tpm-buf.c
index 233e81d3f149..1ea2f2121f37 100644
--- a/drivers/char/tpm/tpm-buf.c
+++ b/drivers/char/tpm/tpm-buf.c
@@ -204,39 +204,37 @@ void tpm_buf_append_handle(struct tpm_buf *buf, u32 handle)
* @offset: offset within the buffer
* @count: the number of bytes to read
* @output: the output buffer
+ *
+ * Return:
+ * * 0 - on success, and @offset is advanced by @count bytes
+ * * -EIO - if the read would cross the end of the buffer
*/
-static void tpm_buf_read(struct tpm_buf *buf, off_t *offset, size_t count, void *output)
+static int tpm_buf_read(struct tpm_buf *buf, off_t *offset, size_t count, void *output)
{
off_t next_offset;
- if (buf->flags & TPM_BUF_INVALID)
- return;
-
next_offset = *offset + count;
- if (next_offset > buf->length) {
- WARN(1, "tpm_buf: read out of boundary\n");
- buf->flags |= TPM_BUF_INVALID;
- return;
- }
+ if (next_offset > buf->length)
+ return -EIO;
memcpy(output, &buf->data[*offset], count);
*offset = next_offset;
+ return 0;
}
/**
* tpm_buf_read_u8() - Read 8-bit word from a TPM buffer
* @buf: &tpm_buf instance
* @offset: offset within the buffer
+ * @value: returns the 8-bit word
*
- * Return: next 8-bit word
+ * Return:
+ * * 0 - on success, and @offset is advanced
+ * * -EIO - if the read would cross the end of the buffer
*/
-u8 tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset)
+int tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset, u8 *value)
{
- u8 value = 0;
-
- tpm_buf_read(buf, offset, sizeof(value), &value);
-
- return value;
+ return tpm_buf_read(buf, offset, sizeof(*value), value);
}
EXPORT_SYMBOL_GPL(tpm_buf_read_u8);
@@ -244,16 +242,23 @@ EXPORT_SYMBOL_GPL(tpm_buf_read_u8);
* tpm_buf_read_u16() - Read 16-bit word from a TPM buffer
* @buf: &tpm_buf instance
* @offset: offset within the buffer
+ * @value: returns the 16-bit word
*
- * Return: next 16-bit word
+ * Return:
+ * * 0 - on success, and @offset is advanced
+ * * -EIO - if the read would cross the end of the buffer
*/
-u16 tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset)
+int tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset, u16 *value)
{
- u16 value = 0;
+ __be16 value_be;
+ int rc;
- tpm_buf_read(buf, offset, sizeof(value), &value);
+ rc = tpm_buf_read(buf, offset, sizeof(value_be), &value_be);
+ if (rc)
+ return rc;
- return be16_to_cpu(value);
+ *value = be16_to_cpu(value_be);
+ return 0;
}
EXPORT_SYMBOL_GPL(tpm_buf_read_u16);
@@ -261,16 +266,23 @@ EXPORT_SYMBOL_GPL(tpm_buf_read_u16);
* tpm_buf_read_u32() - Read 32-bit word from a TPM buffer
* @buf: &tpm_buf instance
* @offset: offset within the buffer
+ * @value: returns the 32-bit word
*
- * Return: next 32-bit word
+ * Return:
+ * * 0 - on success, and @offset is advanced
+ * * -EIO - if the read would cross the end of the buffer
*/
-u32 tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset)
+int tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset, u32 *value)
{
- u32 value = 0;
+ __be32 value_be;
+ int rc;
- tpm_buf_read(buf, offset, sizeof(value), &value);
+ rc = tpm_buf_read(buf, offset, sizeof(value_be), &value_be);
+ if (rc)
+ return rc;
- return be32_to_cpu(value);
+ *value = be32_to_cpu(value_be);
+ return 0;
}
EXPORT_SYMBOL_GPL(tpm_buf_read_u32);
diff --git a/include/linux/tpm_buf.h b/include/linux/tpm_buf.h
index f8c105d8b8bf..e86193fc6374 100644
--- a/include/linux/tpm_buf.h
+++ b/include/linux/tpm_buf.h
@@ -52,9 +52,9 @@ void tpm_buf_append(struct tpm_buf *buf, const u8 *new_data, u16 new_length);
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);
-u8 tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset);
-u16 tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset);
-u32 tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset);
+int tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset, u8 *value);
+int tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset, u16 *value);
+int tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset, u32 *value);
void tpm_buf_append_handle(struct tpm_buf *buf, u32 handle);
#endif
Br, Jarkko
prev parent reply other threads:[~2026-11-16 0:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-15 23:31 [PATCH v2 0/4] Unsorted tpm2-sessions improvements Jarkko Sakkinen
2026-11-15 23:31 ` [PATCH v2 1/4] tpm2-sessions: Drop TPM2_NAME_SIZE Jarkko Sakkinen
2026-11-15 23:35 ` sashiko-bot
2026-11-15 23:31 ` [PATCH v2 2/4] KEYS: trusted: Open code tpm2_buf_append_auth() Jarkko Sakkinen
2026-11-15 23:36 ` sashiko-bot
2026-11-15 23:31 ` [PATCH v2 3/4] KEYS: trusted: Remove dead branch from tpm2_unseal_cmd Jarkko Sakkinen
2026-11-15 23:36 ` sashiko-bot
2026-11-15 23:31 ` [PATCH v2 4/4] tpm2-sessions: Re-orchestrate tpm2_read_public() use Jarkko Sakkinen
2026-11-15 23:40 ` sashiko-bot
2026-11-15 23:43 ` [PATCH v2 0/4] Unsorted tpm2-sessions improvements Jarkko Sakkinen
2026-11-15 23:52 ` Jarkko Sakkinen
2026-11-16 0:04 ` Jarkko Sakkinen [this message]
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=avpIcBVKGFikTkAN@kernel.org \
--to=jarkko@kernel.org \
--cc=James.Bottomley@hansenpartnership.com \
--cc=alec.r.brown@oracle.com \
--cc=dhowells@redhat.com \
--cc=dpsmith@apertussolutions.com \
--cc=ebiggers@kernel.org \
--cc=jgg@ziepe.ca \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=noodles@earth.li \
--cc=paul@paul-moore.com \
--cc=peterhuewe@gmx.de \
--cc=roberto.sassu@huawei.com \
--cc=ross.philipson@gmail.com \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.com \
/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.