Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1386743

Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling tpm2_shutdown()

Show all headers | View raw

On Mon, Apr 25, 2016 at 11:57:20AM -0600, Jason Gunthorpe wrote:
> On Mon, Apr 25, 2016 at 12:21:30PM +0300, Jarkko Sakkinen wrote:
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Reported-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> >  drivers/char/tpm/tpm-chip.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> Reviewed-By: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Fixes: 20e0152393b41 ("tpm: fix crash in tpm_tis deinitialization")

Thanks and thanks for the fixes line (forgot to add it) :)

/Jarkko

> > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > index a12db8e..1965dc7 100644
> > +++ b/drivers/char/tpm/tpm-chip.c
> > @@ -270,7 +270,8 @@ static void tpm_del_char_device(struct tpm_chip *chip)
> >  
> >  	/* Make the driver uncallable. */
> >  	down_write(&chip->ops_sem);
> > -	tpm2_shutdown(chip, TPM2_SU_CLEAR);
> > +	if (chip->flags & TPM_CHIP_FLAG_TPM2)
> > +		tpm2_shutdown(chip, TPM2_SU_CLEAR);
> >  	chip->ops = NULL;
> >  	up_write(&chip->ops_sem);
> >  }
> 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling tpm2_shutdown() Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-04-25 11:30 +0200
  Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling  tpm2_shutdown() Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-04-25 20:00 +0200
    Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling  tpm2_shutdown() Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-04-25 20:50 +0200
    Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling  tpm2_shutdown() Stefan Berger <stefanb@linux.vnet.ibm.com> - 2016-04-25 21:10 +0200

csiph-web