[GIT PULL] security subsytem: TPM changes for v5.2

[GIT PULL] security subsytem: TPM changes for v5.2

[James Morris]

From Jarkko:

Bugfixes and new selftests for v5.1 features (partial reads in /dev/tpm0).


The following changes since commit 8d93e952fba216cd0811247f6360d97e0465d5fc:

  LSM: lsm_hooks.h: fix documentation format (2019-03-26 16:46:22 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-tpm

for you to fetch changes up to a94e55b91c7d1494c1a4598178dc5f1d7dfe12aa:

  Merge tag 'tpmdd-next-20190329' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm (2019-03-29 11:39:20 -0700)

----------------------------------------------------------------
James Morris (1):
      Merge tag 'tpmdd-next-20190329' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm

Jarkko Sakkinen (2):
      KEYS: trusted: allow trusted.ko to initialize w/o a TPM
      tpm: turn on TPM on suspend for TPM 1.x

Tadeusz Struk (3):
      selftests/tpm2: Open tpm dev in unbuffered mode
      selftests/tpm2: Extend tests to cover partial reads
      tpm: fix an invalid condition in tpm_common_poll

Yue Haibing (1):
      tpm: Fix the type of the return value in calc_tpm2_event_size()

ndesaulniers@google.com (1):
      KEYS: trusted: fix -Wvarags warning

 drivers/char/tpm/eventlog/tpm2.c           |  4 +-
 drivers/char/tpm/tpm-dev-common.c          |  9 ++++-
 drivers/char/tpm/tpm-interface.c           | 14 +++----
 include/keys/trusted.h                     |  2 +-
 security/keys/trusted.c                    | 32 +++++++++++----
 tools/testing/selftests/tpm2/tpm2.py       |  5 ++-
 tools/testing/selftests/tpm2/tpm2_tests.py | 63 ++++++++++++++++++++++++++++++
 7 files changed, 108 insertions(+), 21 deletions(-)

Re: [GIT PULL] security subsytem: TPM changes for v5.2

[Linus Torvalds]

On Thu, May 9, 2019 at 10:23 AM James Morris <jmorris@namei.org> wrote:
>
> Bugfixes and new selftests for v5.1 features (partial reads in /dev/tpm0).

What the heck is going on?

I got all of these long ago in the "TPM fixes" branch for 5.1. One
month ago, merge commit a556810d8e06.

These are just rebased (!) copies of stuff I already have, and they should

 (a) never have been rebased in the first place

 (b) certainly not be re-sent to me as a new branch

Please throw this branch away and make sure it really is dead and
buried and never shows up again.

And take a moment to look at what happened and why this broken branch
was duplicated and sent twice!

              Linus

Re: [GIT PULL] security subsytem: TPM changes for v5.2

[James Morris]

On Thu, 9 May 2019, Linus Torvalds wrote:

> On Thu, May 9, 2019 at 10:23 AM James Morris <jmorris@namei.org> wrote:
> >
> > Bugfixes and new selftests for v5.1 features (partial reads in /dev/tpm0).
> 
> What the heck is going on?
> 
> I got all of these long ago in the "TPM fixes" branch for 5.1. One
> month ago, merge commit a556810d8e06.
> 
> These are just rebased (!) copies of stuff I already have, and they should
> 
>  (a) never have been rebased in the first place
> 
>  (b) certainly not be re-sent to me as a new branch
> 
> Please throw this branch away and make sure it really is dead and
> buried and never shows up again.

Yikes, ok.

> And take a moment to look at what happened and why this broken branch
> was duplicated and sent twice!

Could it be something I pulled in? I haven't used 'rebase' in many years.


-- 
James Morris
<jmorris@namei.org>