diff options
| author | James Morris <james.morris@microsoft.com> | 2018-07-30 09:30:19 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-07-30 09:30:19 -0700 |
| commit | 5da08f7d01693433ff6bea0c3462a5173d577540 (patch) | |
| tree | a2a302177adbd31edcba2f9cd254f963853711e2 /security/integrity/ima/ima_crypto.c | |
| parent | 87ea58433208d17295e200d56be5e2a4fe4ce7d6 (diff) | |
| parent | ec403d8ed08c8272cfeeeea154fdebcd289988c8 (diff) | |
| download | linux-5da08f7d01693433ff6bea0c3462a5173d577540.tar.bz2 | |
Merge tag 'tpmdd-next-20180728' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm
tpmdd updates for Linux 4.19
From Jarkko:
* Migrated away from PM runtime as explicit cmdReady/goIdle trasactions
for every command is a spec requirement. PM runtime adds only a layer of
complexity on our case.
* tpm_tis drivers can now specify the hwrng quality.
* TPM 2.0 code uses now tpm_buf for constructing messages. I think Tomas
Winkler has done the same for TPM 1.2. I'll start digging those
changes from the patchwork in the near future.
* Bug fixes and clean ups.
Diffstat (limited to 'security/integrity/ima/ima_crypto.c')
| -rw-r--r-- | security/integrity/ima/ima_crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 4e085a17124f..7e7e7e7c250a 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -631,10 +631,10 @@ int ima_calc_buffer_hash(const void *buf, loff_t len, static void __init ima_pcrread(int idx, u8 *pcr) { - if (!ima_used_chip) + if (!ima_tpm_chip) return; - if (tpm_pcr_read(NULL, idx, pcr) != 0) + if (tpm_pcr_read(ima_tpm_chip, idx, pcr) != 0) pr_err("Error Communicating to TPM chip\n"); } |