[PATCH] tpm: tpm_try_transmit() ignore value of go_to_idle()

Winkler, Tomas tomas.winkler at intel.com
Wed Oct 17 23:08:46 UTC 2018



> -----Original Message-----
> From: Jarkko Sakkinen [mailto:jarkko.sakkinen at linux.intel.com]
> Sent: Thursday, October 18, 2018 02:01
> To: Winkler, Tomas <tomas.winkler at intel.com>
> Cc: Jarkko Sakkinen <jarkko.sakkinen at linux.intel.com>; Jason Gunthorpe
> <jgg at ziepe.ca>; Nayna Jain <nayna at linux.vnet.ibm.com>; Usyskin,
> Alexander <alexander.usyskin at intel.com>; Struk, Tadeusz
> <tadeusz.struk at intel.com>; linux-integrity at vger.kernel.org; linux-security-
> module at vger.kernel.org; linux-kernel at vger.kernel.org
> Subject: Re: [PATCH] tpm: tpm_try_transmit() ignore value of go_to_idle()
> 
> On Mon, 15 Oct 2018, Tomas Winkler wrote:
> > Ignore the return value of go_to_idle() in tpm_try_transmit().
> > Once it may shadow the return value of actual tpm operation, second
> > the consequent command will fail as well and the error will be caought
> > anyway.
> > Last fix wrong goto, that jumped back instead of forward.
> >
> > Fixes: 627448e85c76 ("tpm: separate cmd_ready/go_idle from
> > runtime_pm")
> > Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
> > ---
> > drivers/char/tpm/tpm-interface.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/char/tpm/tpm-interface.c
> > b/drivers/char/tpm/tpm-interface.c
> > index 129f640424b7..f69c711bf74a 100644
> > --- a/drivers/char/tpm/tpm-interface.c
> > +++ b/drivers/char/tpm/tpm-interface.c
> > @@ -547,9 +547,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip
> *chip,
> > 		dev_err(&chip->dev, "tpm2_commit_space: error %d\n", rc);
> >
> > out:
> > -	rc = tpm_go_idle(chip, flags);
> > -	if (rc)
> > -		goto out;
> > +	(void)tpm_go_idle(chip, flags);
> >
> > 	if (need_locality)
> > 		tpm_relinquish_locality(chip, flags);
> > --
> > 2.14.4
> >
> >
> 
> LGTM. Should be probably Cc'd to stable (can add).
> 
> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen at linux.intel.com>
I've posted another one, there are more issues in the flow.



More information about the Linux-security-module-archive mailing list