Linux Integrity Measurement development
 help / color / mirror / Atom feed
From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Alexander Steffen" <Alexander.Steffen@infineon.com>,
	<linux-integrity@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 2/4] tpm_tis: Move CRC check to generic send routine
Date: Wed, 07 Jun 2023 00:10:28 +0300	[thread overview]
Message-ID: <CT5VJKCFVQVT.3J6KJMTN0YSZW@suppilovahvero> (raw)
In-Reply-To: <20230605175959.2131-3-Alexander.Steffen@infineon.com>

On Mon Jun 5, 2023 at 8:59 PM EEST, Alexander Steffen wrote:
> The CRC functionality is initialized before tpm_tis_core, so it can be used
> on all code paths within the module. Therefore, move the CRC check to the
> generic send routine, that also contains all other checks for successful
> command transmission, so that all those checks are in one place.
>
> Also, this ensures that tpm_tis_ready is called when a CRC failure is
> detected, to clear the invalid data from the TPM, which did not happen
> previously.
>
> Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
> ---
>  drivers/char/tpm/tpm_tis_core.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index aaaa136044ae..5ddaf24518be 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -466,6 +466,12 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len)
>  		goto out_err;
>  	}
>  
> +	rc = tpm_tis_verify_crc(priv, len, buf);
> +	if (rc < 0) {
> +		dev_err(&chip->dev, "CRC mismatch for command.\n");
> +		goto out_err;
> +	}
> +
>  	return 0;
>  
>  out_err:
> @@ -510,12 +516,6 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len)
>  	if (rc < 0)
>  		return rc;
>  
> -	rc = tpm_tis_verify_crc(priv, len, buf);
> -	if (rc < 0) {
> -		dev_err(&chip->dev, "CRC mismatch for command.\n");
> -		return rc;
> -	}
> -
>  	/* go and do it */
>  	rc = tpm_tis_write8(priv, TPM_STS(priv->locality), TPM_STS_GO);
>  	if (rc < 0)
> -- 
> 2.34.1

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko

  reply	other threads:[~2023-06-06 21:10 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-05 17:59 [PATCH 0/4] Recovery from data transfer errors for tpm_tis Alexander Steffen
2023-06-05 17:59 ` [PATCH v2 1/4] tpm_tis: Explicitly check for error code Alexander Steffen
2023-06-06 21:09   ` Jarkko Sakkinen
2023-06-05 17:59 ` [PATCH v2 2/4] tpm_tis: Move CRC check to generic send routine Alexander Steffen
2023-06-06 21:10   ` Jarkko Sakkinen [this message]
2023-06-05 17:59 ` [PATCH v2 3/4] tpm_tis: Use responseRetry to recover from data transfer errors Alexander Steffen
2023-06-06 21:17   ` Jarkko Sakkinen
2023-06-07 17:14     ` Alexander Steffen
2023-06-08 14:00       ` Jarkko Sakkinen
2023-06-13 17:37         ` Alexander Steffen
2023-06-06 21:18   ` Jarkko Sakkinen
2023-06-05 17:59 ` [PATCH v2 4/4] tpm_tis: Resend command " Alexander Steffen
2023-06-06 21:19   ` 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=CT5VJKCFVQVT.3J6KJMTN0YSZW@suppilovahvero \
    --to=jarkko@kernel.org \
    --cc=Alexander.Steffen@infineon.com \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox