From: Paul Menzel <pmenzel@molgen.mpg.de>
To: Shahriyar Jalayeri <shahriyar@posteo.de>
Cc: peterhuewe@gmx.de, jarkko@kernel.org, jgg@ziepe.ca,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tpm: infineon: add bounds check in tpm_inf_recv
Date: Fri, 3 Oct 2025 13:22:11 +0200 [thread overview]
Message-ID: <c0a4d2bb-be78-4aac-b66b-c1eb766e7efd@molgen.mpg.de> (raw)
In-Reply-To: <20251003092544.12118-1-shahriyar@posteo.de>
Dear Shahriyar,
Thank you for your patch.
Am 03.10.25 um 11:25 schrieb Shahriyar Jalayeri:
> Ensure tpm_inf_recv() does not overflow the provided buffer when
> the TPM reports more data than the caller expects.
Is it possible to enforce this situation to ensure your patch works?
> Signed-off-by: Shahriyar Jalayeri <shahriyar@posteo.de>
> ---
> drivers/char/tpm/tpm_infineon.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
> index 7638b65b8..eb6dd55ff 100644
> --- a/drivers/char/tpm/tpm_infineon.c
> +++ b/drivers/char/tpm/tpm_infineon.c
> @@ -250,6 +250,12 @@ static int tpm_inf_recv(struct tpm_chip *chip, u8 * buf, size_t count)
> number_of_wtx = 0;
>
> recv_begin:
> + if (count < 4) {
> + dev_err(&chip->dev,
> + "count less than the header size!\n");
Mention both values count and 4?
> + return -EIO;
> + }
> +
This is not described in the commit message.
> /* start receiving header */
> for (i = 0; i < 4; i++) {
> ret = wait(chip, STAT_RDA);
> @@ -268,6 +274,12 @@ static int tpm_inf_recv(struct tpm_chip *chip, u8 * buf, size_t count)
> /* size of the data received */
> size = ((buf[2] << 8) | buf[3]);
>
> + if (size > count) {
> + dev_err(&chip->dev,
> + "Buffer too small for incoming data!\n");
I’d log both values, and also specify that the operation is aborted.
> + return -EIO;
> + }
> +
> for (i = 0; i < size; i++) {
> wait(chip, STAT_RDA);
> buf[i] = tpm_data_in(RDFIFO);
Kind regards,
Paul
next prev parent reply other threads:[~2025-10-03 11:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-03 9:25 Shahriyar Jalayeri
2025-10-03 11:22 ` Paul Menzel [this message]
2025-10-04 8:35 ` Shahriyar
2025-10-04 12:29 ` Jarkko Sakkinen
2025-10-04 9:04 Shahriyar Jalayeri
2025-10-04 12:33 ` Jarkko Sakkinen
2025-10-07 9:07 Shahriyar Jalayeri
2025-10-07 19:25 ` Jarkko Sakkinen
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=c0a4d2bb-be78-4aac-b66b-c1eb766e7efd@molgen.mpg.de \
--to=pmenzel@molgen.mpg.de \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=shahriyar@posteo.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®