Skip to content

Remove nested TPM operations

Jarkko Sakkinen linux-integrity linux-security-module lkml 12 versions – Applied

Status from this message: Applied to master and next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v11 Latest16 patches 25 repliesApplied
  2. v1017 patches 15 repliesSuperseded
  3. v917 patches 19 repliesSuperseded
Earlier versions · 9
VersionPostedPatchesRepliesStatus
v817 patches9 repliesSuperseded
v7 posting 2/20 of 17 patches1 replySuperseded
v7 posting 1/217 patches10 repliesSuperseded
v617 patches2 repliesSuperseded
v517 patches20 repliesSuperseded
v417 patches0 repliesSuperseded
v315 of 16 patches17 repliesSuperseded
v21 patch0 repliesSuperseded
v11 patch0 repliesSuperseded

Changes in v11 from the cover letter

* Drop the patch that tries to flush TPM space on system. Not a proper fallback + out of scope for this patch set.

Patches in v11 Applied

#Subject and filesSizeRepliesApplied
1/16tpm: use tpm_buf in tpm_transmit_cmd() as the IO parameterdrivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm-sysfs.c drivers/char/tpm/tpm.h +4 more+64 -800 replies
2/16tpm: fix invalid return value in pubek_show()drivers/char/tpm/tpm-sysfs.c+2 -30 replies
3/16tpm: return 0 from pcrs_show() when tpm1_pcr_read() failsdrivers/char/tpm/tpm-sysfs.c+6 -70 replies
4/16tpm: print tpm2_commit_space() error inside tpm2_commit_space()drivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm2-space.c+6 -50 replies
5/16tpm: declare struct tpm_headerdrivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm.h drivers/char/tpm/tpm2-cmd.c +4 more+34 -430 replies
6/16tpm: access command header through struct in tpm_try_transmit()drivers/char/tpm/tpm-interface.c+2 -20 replies
7/16tpm: encapsulate tpm_dev_transmit()drivers/char/tpm/tpm-dev-common.c+18 -70 replies
8/16tpm: clean up tpm_try_transmit() error handling flowdrivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm.h drivers/char/tpm/tpm2-space.c+45 -521 reply
9/16tpm: move tpm_validate_commmand() to tpm2-space.cdrivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm.h drivers/char/tpm/tpm2-space.c+67 -640 replies
10/16tpm: move TPM space code out of tpm_transmit()drivers/char/tpm/tpm-dev-common.c drivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm2-space.c+34 -330 replies
11/16tpm: remove @space from tpm_transmit()drivers/char/tpm/tpm-dev-common.c drivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm-sysfs.c +5 more+43 -530 replies
12/16tpm: use tpm_try_get_ops() in tpm-sysfs.c.drivers/char/tpm/tpm-sysfs.c+78 -450 replies
13/16tpm: remove TPM_TRANSMIT_UNLOCKED flagdrivers/char/tpm/tpm-chip.c drivers/char/tpm/tpm-dev-common.c drivers/char/tpm/tpm-interface.c +3 more+17 -380 replies
14/16tpm: introduce tpm_chip_start() and tpm_chip_stop()drivers/char/tpm/tpm-chip.c drivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm.h+115 -810 replies
15/16tpm: take TPM chip power gating out of tpm_transmit()drivers/char/tpm/tpm-chip.c drivers/char/tpm/tpm-interface.c drivers/char/tpm/tpm.h +2 more+17 -312 replies
16/16tpm: remove @flags from tpm_transmit()drivers/char/tpm/tpm-chip.c drivers/char/tpm/tpm-dev-common.c drivers/char/tpm/tpm-interface.c +6 more+65 -820 replies

Reviews trailers per patch

All 16 patches have a Reviewed-by or Acked-by.

PatchStefan BergerJerry SnitselaarJames Bottomley
1/16R-b T-b R-b R-b
2/16R-b T-b R-b R-b
3/16R-b T-b R-b R-b
4/16R-b T-b R-b R-b
5/16R-b T-b R-b R-b
6/16R-b T-b R-b R-b
7/16R-b T-b R-b R-b
8/16R-b T-b R-b R-b
9/16R-b T-b R-b R-b
10/16R-b T-b R-b R-b
11/16R-b T-b R-b R-b
12/16R-b T-b R-b R-b
13/16R-b T-b R-b R-b
14/16R-b T-b R-b R-b
15/16R-b T-b R-b R-b
16/16R-b T-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v11 thread

Cover letter [PATCH v11 00/16] Remove nested TPM operations

Make the changes necessary to detach TPM space code and TPM activation code out of the tpm_transmit() flow because of both of these can cause nested tpm_transmit() calls. The nesteds calls make the whole flow hard to maintain, and thus, it is better to just fix things now before this turns into a bigger mess.

v11:
* Drop the patch that tries to flush TPM space on system. Not a proper fallback + out of scope for this patch set.

v10:
* Use void pointers to avoid unnecessary casts in functions paramaters where it makes sense.

v9:
* Fixed again tpm_try_get_ops().
* Added missing reviewed-by's.

v8:
* Re-add the check for ret < 0 after calling tpm_try_transmit() that was dropped by mistake while moving code.
* Fix error fallback for tpm_try_get_ops() when tpm_chip_start() fails.

v7:
* Reorganize series so that more trivial and self-contained changes are in the head.

v6:
* When tpm_validate_commmand() was moved to tpm2-space.c, the struct for the TPM header was incorrectly declared as struct tpm_input_header.
* Fix return value in tpm_validate_command().

v5:
* Add the missing rev's from Stefan Berger.

v4:
* Return 0 from pcrs_show() when tpm1_pcr_read() fails.
* Fix error handling flow in tpm_try_transmit().
* Replace struct tpm_input_header and struct tpm_output_header with struct tpm_header.

v3:
* Encapsulate power gating code to tpm_chip_start() and tpm_chip_stop().
* Move TPM power gating code and locking to tpm_try_get_ops() and tpm_put_ops().
* Call power gating code directly in tpm_chip_register() and tpm2_del_space().

v2:
* Print tpm2_commit_space() error inside tpm2_commit_space()
* Error code was not printed when recv() callback failed. It is fixed in this version.
* Added a patch that removes @space from tpm_transmit().
* Fixed a regression in earlier series. Forgot to amend the change from the staging area that renames NESTED to UNLOCKED in tpm2-space.c.

Jarkko Sakkinen (16):
tpm: use tpm_buf in tpm_transmit_cmd() as the IO parameter
tpm: fix invalid return value in pubek_show()
tpm: return 0 from pcrs_show() when tpm1_pcr_read() fails
tpm: print tpm2_commit_space() error inside tpm2_commit_space()
tpm: declare struct tpm_header
tpm: access command header through struct in tpm_try_transmit()
tpm: encapsulate tpm_dev_transmit()
tpm: clean up tpm_try_transmit() error handling flow
tpm: move tpm_validate_commmand() to tpm2-space.c
tpm: move TPM space code out of tpm_transmit()
tpm: remove @space from tpm_transmit()
tpm: use tpm_try_get_ops() in tpm-sysfs.c.
tpm: remove TPM_TRANSMIT_UNLOCKED flag
tpm: introduce tpm_chip_start() and tpm_chip_stop()
tpm: take TPM chip power gating out of tpm_transmit()
tpm: remove @flags from tpm_transmit()

 drivers/char/tpm/tpm-chip.c       | 109 ++++++++++++
 drivers/char/tpm/tpm-dev-common.c |  44 ++++-
 drivers/char/tpm/tpm-interface.c  | 264 ++++++------------------------
 drivers/char/tpm/tpm-sysfs.c      | 138 ++++++++++------
 drivers/char/tpm/tpm.h            |  64 +++-----
 drivers/char/tpm/tpm1-cmd.c       |  28 +---
 drivers/char/tpm/tpm2-cmd.c       |  72 +++-----
 drivers/char/tpm/tpm2-space.c     |  91 +++++++---
 drivers/char/tpm/tpm_i2c_atmel.c  |   5 +-
 drivers/char/tpm/tpm_vtpm_proxy.c |  12 +-
 drivers/char/tpm/xen-tpmfront.c   |   2 +-
 11 files changed, 408 insertions(+), 421 deletions(-)
Signature · 1 line
2.19.1