diff options
| author | James Morris <james.morris@microsoft.com> | 2018-12-17 11:31:58 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-17 11:31:58 -0800 |
| commit | 0db51ef26e87845d1748c363702585e2f0a06266 (patch) | |
| tree | 0af0ee72e875d4d15ca62cba7d491ce6bdfbf086 /security | |
| parent | 8bd8ea195f6d135a8d85201116314eb5237ad7e7 (diff) | |
| parent | 9488585b21bef0df1217e510c7134905d1d376a7 (diff) | |
| download | linux-stable-0db51ef26e87845d1748c363702585e2f0a06266.tar.gz linux-stable-0db51ef26e87845d1748c363702585e2f0a06266.tar.bz2 linux-stable-0db51ef26e87845d1748c363702585e2f0a06266.zip | |
Merge tag 'tpmdd-next-20181217' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm
tpmdd updates for Linux v4.21
From Jarkko:
v4.21 updates:
* Support for partial reads of /dev/tpm0.
* Clean up for TPM 1.x code: move the commands to tpm1-cmd.c and make
everything to use the same data structure for building TPM commands
i.e. struct tpm_buf.
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_crypto.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index d9e7728027c6..acf2c7df7145 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -643,7 +643,7 @@ int ima_calc_buffer_hash(const void *buf, loff_t len, return calc_buffer_shash(buf, len, hash); } -static void __init ima_pcrread(int idx, u8 *pcr) +static void __init ima_pcrread(u32 idx, u8 *pcr) { if (!ima_tpm_chip) return; @@ -659,7 +659,8 @@ static int __init ima_calc_boot_aggregate_tfm(char *digest, struct crypto_shash *tfm) { u8 pcr_i[TPM_DIGEST_SIZE]; - int rc, i; + int rc; + u32 i; SHASH_DESC_ON_STACK(shash, tfm); shash->tfm = tfm; |