summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-07-02 10:00:41 +0200
committerMimi Zohar <zohar@linux.ibm.com>2019-08-05 18:40:28 -0400
commit4ece3125f21b1d42b84896c5646dbf0e878464e1 (patch)
treee48c770e068bf33bc33a8835c496e22494667d5f /security
parentf5e1040196dbfe14c77ce3dfe3b7b08d2d961e88 (diff)
downloadlinux-next-4ece3125f21b1d42b84896c5646dbf0e878464e1.tar.gz
ima: fix freeing ongoing ahash_request
integrity_kernel_read() can fail in which case we forward to call ahash_request_free() on a currently running request. We have to wait for its completion before we can free the request. This was observed by interrupting a "find / -type f -xdev -print0 | xargs -0 cat 1>/dev/null" with ctrl-c on an IMA enabled filesystem. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_crypto.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
index 7532b062be59..73044fc6a952 100644
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
@@ -271,6 +271,11 @@ static int ima_calc_file_hash_atfm(struct file *file,
if (rc != rbuf_len) {
if (rc >= 0)
rc = -EINVAL;
+ /*
+ * Forward current rc, do not overwrite with return value
+ * from ahash_wait()
+ */
+ ahash_wait(ahash_rc, &wait);
goto out3;
}