mbox series

[GIT,PULL] tpmdd fixes for Linux v5.1

Message ID 20190329115544.GA27351@linux.intel.com
State New, archived
Headers show
Series [GIT,PULL] tpmdd fixes for Linux v5.1 | expand

Pull-request

git://git.infradead.org/users/jjs/linux-tpmdd.git tags/tpmdd-next-20190329

Message

Jarkko Sakkinen March 29, 2019, 11:55 a.m. UTC
Hi James,

These are critical fixes for v5.1. Contains also couple of new selftests for
v5.1 features (partial reads in /dev/tpm0). I hope these could still reach
the release. Thanks.

/Jarkko

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.infradead.org/users/jjs/linux-tpmdd.git tags/tpmdd-next-20190329

for you to fetch changes up to ada14f61ed5e111523ace5553d152ca89883c0a4:

  tpm: turn on TPM on suspend for TPM 1.x (2019-03-29 13:48:40 +0200)

----------------------------------------------------------------
tpmdd fixes for Linux v5.1

----------------------------------------------------------------
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(-)

Comments

James Morris March 29, 2019, 6:41 p.m. UTC | #1
On Fri, 29 Mar 2019, Jarkko Sakkinen wrote:

> Hi James,
> 
> These are critical fixes for v5.1. Contains also couple of new selftests for
> v5.1 features (partial reads in /dev/tpm0). I hope these could still reach
> the release. Thanks.

Applied to 
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-tpm
Jarkko Sakkinen April 1, 2019, 10:02 a.m. UTC | #2
On Sat, Mar 30, 2019 at 05:41:19AM +1100, James Morris wrote:
> On Fri, 29 Mar 2019, Jarkko Sakkinen wrote:
> 
> > Hi James,
> > 
> > These are critical fixes for v5.1. Contains also couple of new selftests for
> > v5.1 features (partial reads in /dev/tpm0). I hope these could still reach
> > the release. Thanks.
> 
> Applied to 
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-tpm

Thank you.

/Jarkko
Dan Williams April 8, 2019, 4:21 p.m. UTC | #3
On Fri, Mar 29, 2019 at 11:42 AM James Morris <jmorris@namei.org> wrote:
>
> On Fri, 29 Mar 2019, Jarkko Sakkinen wrote:
>
> > Hi James,
> >
> > These are critical fixes for v5.1. Contains also couple of new selftests for
> > v5.1 features (partial reads in /dev/tpm0). I hope these could still reach
> > the release. Thanks.
>
> Applied to
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-tpm

Hi James,

Friendly ping on when might this go to Linus?

I was hoping that 3d0b1a381f6e ("KEYS: trusted: allow trusted.ko to
initialize w/o a TPM") would have hit -rc4. The NVDIMM subsystem has
been broken since -rc1.
James Morris April 8, 2019, 10:13 p.m. UTC | #4
On Mon, 8 Apr 2019, Dan Williams wrote:

> On Fri, Mar 29, 2019 at 11:42 AM James Morris <jmorris@namei.org> wrote:
> >
> > On Fri, 29 Mar 2019, Jarkko Sakkinen wrote:
> >
> > > Hi James,
> > >
> > > These are critical fixes for v5.1. Contains also couple of new selftests for
> > > v5.1 features (partial reads in /dev/tpm0). I hope these could still reach
> > > the release. Thanks.
> >
> > Applied to
> > git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-tpm
> 
> Hi James,
> 
> Friendly ping on when might this go to Linus?
> 
> I was hoping that 3d0b1a381f6e ("KEYS: trusted: allow trusted.ko to
> initialize w/o a TPM") would have hit -rc4. The NVDIMM subsystem has
> been broken since -rc1.

Oops, I queued these for the wrong tree, will send to Linus today.