diff options
author | Stefan Berger | 2018-06-26 21:09:33 +0200 |
---|---|---|
committer | Jarkko Sakkinen | 2018-07-28 16:03:11 +0200 |
commit | ec403d8ed08c8272cfeeeea154fdebcd289988c8 (patch) | |
tree | a2a302177adbd31edcba2f9cd254f963853711e2 /security/integrity/ima/ima_crypto.c | |
parent | ima: Use tpm_default_chip() and call TPM functions with a tpm_chip (diff) | |
download | kernel-qcow2-linux-ec403d8ed08c8272cfeeeea154fdebcd289988c8.tar.gz kernel-qcow2-linux-ec403d8ed08c8272cfeeeea154fdebcd289988c8.tar.xz kernel-qcow2-linux-ec403d8ed08c8272cfeeeea154fdebcd289988c8.zip |
ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead
Get rid of ima_used_chip and use ima_tpm_chip variable instead for
determining whether to use the TPM chip.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'security/integrity/ima/ima_crypto.c')
-rw-r--r-- | security/integrity/ima/ima_crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 88082f35adb2..7e7e7e7c250a 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -631,7 +631,7 @@ 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(ima_tpm_chip, idx, pcr) != 0) |