linux-kernel - Re: [PATCH] tpm: Re-enable TPM chip boostrapping non-tpm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 27 Apr 2023 09:58:34 +0800
From:   Pengfei Xu <pengfei.xu@...el.com>
To:     Jarkko Sakkinen <jarkko@...nel.org>
CC:     <linux-integrity@...r.kernel.org>, Peter Huewe <peterhuewe@....de>,
        "Jason Gunthorpe" <jgg@...pe.ca>,
        Lino Sanfilippo <l.sanfilippo@...bus.com>,
        <linux-kernel@...r.kernel.org>, <heng.su@...el.com>
Subject: Re: [PATCH] tpm: Re-enable TPM chip boostrapping non-tpm_tis TPM
 drivers

On 2023-04-26 at 21:58:33 +0300, Jarkko Sakkinen wrote:
> TPM chip bootstrapping was removed from tpm_chip_register(), and it
> was relocated to tpm_tis_core. This breaks all drivers which are not
> based on tpm_tis because the chip will not get properly initialized.
> 
> Take the corrective steps:
> 1. Rename tpm_chip_startup() as tpm_chip_bootstrap() and make it one-shot.
> 2. Call tpm_chip_bootstrap() in tpm_chip_register(), which reverts the
>    things  as tehy used to be.
           ^ two space and one typo "they"
	   Thanks for your fixed patch in short time!

  And I tested this patch, it could not be reproduced in 155s, and the patch
  fixed this issue.
  Fixed dmesg is in attached.

Tested-by: Pengfei Xu <pengfei.xu@...el.com>

 Thanks!
 BR.

> 
> Cc: Lino Sanfilippo <l.sanfilippo@...bus.com>
> Reported-by: Pengfei Xu <pengfei.xu@...el.com>
> Link: https://lore.kernel.org/all/ZEjqhwHWBnxcaRV5@xpf.sh.intel.com/
> Fixes: 548eb516ec0f ("tpm, tpm_tis: startup chip before testing for interrupts")
> Signed-off-by: Jarkko Sakkinen <jarkko@...nel.org>
> ---
>  drivers/char/tpm/tpm-chip.c     | 22 +++++++++++++++++++---
>  drivers/char/tpm/tpm.h          |  2 +-
>  drivers/char/tpm/tpm_tis_core.c |  2 +-
>  include/linux/tpm.h             | 13 +++++++------
>  4 files changed, 28 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 6fdfa65a00c3..b8a484b4ff7a 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -606,13 +606,19 @@ static int tpm_get_pcr_allocation(struct tpm_chip *chip)
>  }
>  
>  /*
> - * tpm_chip_startup() - performs auto startup and allocates the PCRs
> + * tpm_chip_bootstrap() - Boostrap TPM chip after power on
>   * @chip: TPM chip to use.
> + *
> + * Initialize TPM chip after power on. This a one-shot function: subsequent
> + * calls will have no effect.
>   */
> -int tpm_chip_startup(struct tpm_chip *chip)
> +int tpm_chip_bootstrap(struct tpm_chip *chip)
>  {
>  	int rc;
>  
> +	if (chip->flags & TPM_CHIP_FLAG_BOOTSTRAP)
> +		return 0;
> +
>  	rc = tpm_chip_start(chip);
>  	if (rc)
>  		return rc;
> @@ -625,9 +631,15 @@ int tpm_chip_startup(struct tpm_chip *chip)
>  stop:
>  	tpm_chip_stop(chip);
>  
> +	/*
> +	 * Unconditionally set, as driver initialization should cease, when the
> +	 * boostrapping process fails.
> +	 */
> +	chip->flags |= TPM_CHIP_FLAG_BOOTSTRAP;
> +
>  	return rc;
>  }
> -EXPORT_SYMBOL_GPL(tpm_chip_startup);
> +EXPORT_SYMBOL_GPL(tpm_chip_bootstrap);
>  
>  /*
>   * tpm_chip_register() - create a character device for the TPM chip
> @@ -644,6 +656,10 @@ int tpm_chip_register(struct tpm_chip *chip)
>  {
>  	int rc;
>  
> +	rc = tpm_chip_bootstrap(chip);
> +	if (rc)
> +		return rc;
> +
>  	tpm_sysfs_add_device(chip);
>  
>  	tpm_bios_log_setup(chip);
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index 88d3bd76e076..f6c99b3f0045 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -263,7 +263,7 @@ static inline void tpm_msleep(unsigned int delay_msec)
>  		     delay_msec * 1000);
>  };
>  
> -int tpm_chip_startup(struct tpm_chip *chip);
> +int tpm_chip_bootstrap(struct tpm_chip *chip);
>  int tpm_chip_start(struct tpm_chip *chip);
>  void tpm_chip_stop(struct tpm_chip *chip);
>  struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip);
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index c2421162cf34..02945d53fcef 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -1139,7 +1139,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
>  	init_waitqueue_head(&priv->read_queue);
>  	init_waitqueue_head(&priv->int_queue);
>  
> -	rc = tpm_chip_startup(chip);
> +	rc = tpm_chip_bootstrap(chip);
>  	if (rc)
>  		goto out_err;
>  
> diff --git a/include/linux/tpm.h b/include/linux/tpm.h
> index 4dc97b9f65fb..50bcdee19b12 100644
> --- a/include/linux/tpm.h
> +++ b/include/linux/tpm.h
> @@ -274,13 +274,14 @@ enum tpm2_cc_attrs {
>  #define TPM_VID_ATML     0x1114
>  
>  enum tpm_chip_flags {
> -	TPM_CHIP_FLAG_TPM2		= BIT(1),
> -	TPM_CHIP_FLAG_IRQ		= BIT(2),
> -	TPM_CHIP_FLAG_VIRTUAL		= BIT(3),
> -	TPM_CHIP_FLAG_HAVE_TIMEOUTS	= BIT(4),
> -	TPM_CHIP_FLAG_ALWAYS_POWERED	= BIT(5),
> +	TPM_CHIP_FLAG_TPM2			= BIT(1),
> +	TPM_CHIP_FLAG_IRQ			= BIT(2),
> +	TPM_CHIP_FLAG_VIRTUAL			= BIT(3),
> +	TPM_CHIP_FLAG_HAVE_TIMEOUTS		= BIT(4),
> +	TPM_CHIP_FLAG_ALWAYS_POWERED		= BIT(5),
>  	TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED	= BIT(6),
> -	TPM_CHIP_FLAG_FIRMWARE_UPGRADE	= BIT(7),
> +	TPM_CHIP_FLAG_FIRMWARE_UPGRADE		= BIT(7),
> +	TPM_CHIP_FLAG_BOOTSTRAP			= BIT(8),
>  };
>  
>  #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)
> -- 
> 2.39.2
> 

View attachment "v6.3_tpm_patch_fixed.log" of type "text/plain" (1349857 bytes)