From: Roberto Sassu Date: Fri, 4 Sep 2020 09:23:28 +0000 (+0200) Subject: ima: Don't ignore errors from crypto_shash_update() X-Git-Tag: v5.15~2656^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60386b854008adc951c470067f90a2d85b5d520f;p=platform%2Fkernel%2Flinux-starfive.git ima: Don't ignore errors from crypto_shash_update() 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: 3323eec921efd ("integrity: IMA as an integrity service provider") Signed-off-by: Roberto Sassu Signed-off-by: Mimi Zohar --- diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 011c3c7..21989fa 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -829,6 +829,8 @@ static int ima_calc_boot_aggregate_tfm(char *digest, u16 alg_id, /* now accumulate with current aggregate */ rc = crypto_shash_update(shash, d.digest, crypto_shash_digestsize(tfm)); + if (rc != 0) + return rc; } /* * Extend cumulative digest over TPM registers 8-9, which contain