[GIT PULL] TPM timeout fix

[GIT PULL] TPM timeout fix

[Rajiv Andrade]

Hi James,

Please pull from:
     git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd/ for-james

The following change corrects the logic used to extract the timeouts returned from a TPM.
These values are used subsequently in the TPM device driver, and if relying on the default values,
some commands may not have its proper timeout considered. This is a bugfix for the current linus tree.

Stefan Berger (1):
       tpm_tis: Use timeouts returned from TPM

Diffstat:
  drivers/char/tpm/tpm.c     |   18 ++++++++++++++++--
  drivers/char/tpm/tpm.h     |    2 ++
  drivers/char/tpm/tpm_tis.c |    4 +++-
  3 files changed, 21 insertions(+), 3 deletions(-)

Re: [GIT PULL] TPM timeout fix

[James Morris]

On Fri, 11 Feb 2011, Rajiv Andrade wrote:

> Hi James,
> 
> Please pull from:
>     git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd/ for-james
> 
> The following change corrects the logic used to extract the timeouts returned
> from a TPM.
> These values are used subsequently in the TPM device driver, and if relying on
> the default values,
> some commands may not have its proper timeout considered. This is a bugfix for
> the current linus tree.
> 
> Stefan Berger (1):
>       tpm_tis: Use timeouts returned from TPM

Thanks, applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#for-linus


-- 
James Morris
<jmorris@namei.org>

Re: [GIT PULL] TPM timeout fix

[Andrew Morton]

On Fri, 11 Feb 2011 02:09:44 -0200 Rajiv Andrade <srajiv@linux.vnet.ibm.com> wrote:

> Hi James,
> 
> Please pull from:
>      git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd/ for-james
> 
> The following change corrects the logic used to extract the timeouts returned from a TPM.
> These values are used subsequently in the TPM device driver, and if relying on the default values,
> some commands may not have its proper timeout considered. This is a bugfix for the current linus tree.
> 
> Stefan Berger (1):
>        tpm_tis: Use timeouts returned from TPM
> 
> Diffstat:
>   drivers/char/tpm/tpm.c     |   18 ++++++++++++++++--
>   drivers/char/tpm/tpm.h     |    2 ++
>   drivers/char/tpm/tpm_tis.c |    4 +++-
>   3 files changed, 21 insertions(+), 3 deletions(-)

Please include the full patch in the email unless it's huge, so others
don't need to jump through hoops to see the change.

Is this bug present in 2.6.37 and earlier?  If so, should we fix it in
those kernels?

<finds "tpm_tis: Use timeouts returned from TPM" on the mailing list>

OK, earlier kernels do need fixing.  Hopefully you included
"Cc: <stable@kernel.org>" in the changelog which we weren't shown.

That patch adds a new sysfs file but doesn't alter any documentation
file for it.