From: Matt Bobrowski <mattbobrowski@google.com>
Date: Wed, 4 Jan 2023 03:41:56 +0000 (+0000)
Subject: ima: return IMA digest value only when IMA_COLLECTED flag is set
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=62622dab0a28;p=linux.git

ima: return IMA digest value only when IMA_COLLECTED flag is set

The IMA_COLLECTED flag indicates whether the IMA subsystem has
successfully collected a measurement for a given file object. Ensure
that we return the respective digest value stored within the iint
entry only when this flag has been set.

Failing to check for the presence of this flag exposes consumers of
this IMA API to receive potentially undesired IMA digest values when
an erroneous condition has been experienced in some of the lower level
IMA API code.

Signed-off-by: Matt Bobrowski <mattbobrowski@google.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
---

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index b1ae0f2751f15..1d40cdfa23d5b 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -563,7 +563,7 @@ static int __ima_inode_hash(struct inode *inode, struct file *file, char *buf,
 	 * ima_file_hash can be called when ima_collect_measurement has still
 	 * not been called, we might not always have a hash.
 	 */
-	if (!iint->ima_hash) {
+	if (!iint->ima_hash || !(iint->flags & IMA_COLLECTED)) {
 		mutex_unlock(&iint->mutex);
 		return -EOPNOTSUPP;
 	}