XOR/mint0x33
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ima: Don't ignore errors from crypto_shash_update()

Browse source 
commit 60386b854008adc951c470067f90a2d85b5d520f upstream.

Errors returned by crypto_shash_update() are not checked in
ima_calc_boot_aggregate_tfm() and thus can be overwritten at the next
iteration of the loop. This patch adds a check after calling
crypto_shash_update() and returns immediately if the result is not zero.

Cc: stable@vger.kernel.org
Fixes: 3323eec921 ("integrity: IMA as an integrity service provider")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Roberto Sassu 2020-09-04 11:23:28 +02:00 • committed by Greg Kroah-Hartman
parent 47925a5305
commit d0f7036b12
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
security/integrity/ima/ima_crypto.c
View file

@ -699,6 +699,8 @@ static int __init ima_calc_boot_aggregate_tfm(char *digest,
ima_pcrread(i, pcr_i);
/* now accumulate with current aggregate */
rc = crypto_shash_update(shash, pcr_i, TPM_DIGEST_SIZE);
if (rc != 0)
return rc;
}
if (!rc)
crypto_shash_final(shash, digest);