summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_init.c
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@huawei.com>2021-07-23 10:53:04 +0200
committerMimi Zohar <zohar@linux.ibm.com>2021-07-23 09:27:02 -0400
commitca3c9bdb101d9b9eb3ed8a85cc0fe55915ba49de (patch)
tree46966a8fd69ed70c7223b0c044f5244fddaef4ce /security/integrity/ima/ima_init.c
parentce5bb5a86e5ebcd3c2e40e6dd1382027b5d43caf (diff)
downloadlinux-stable-ca3c9bdb101d9b9eb3ed8a85cc0fe55915ba49de.tar.gz
linux-stable-ca3c9bdb101d9b9eb3ed8a85cc0fe55915ba49de.tar.bz2
linux-stable-ca3c9bdb101d9b9eb3ed8a85cc0fe55915ba49de.zip
ima: Add digest and digest_len params to the functions to measure a buffer
This patch performs the final modification necessary to pass the buffer measurement to callers, so that they provide a functionality similar to ima_file_hash(). It adds the 'digest' and 'digest_len' parameters to ima_measure_critical_data() and process_buffer_measurement(). These functions calculate the digest even if there is no suitable rule in the IMA policy and, in this case, they simply return 1 before generating a new measurement entry. Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_init.c')
-rw-r--r--security/integrity/ima/ima_init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index 5076a7d9d23e..b26fa67476b4 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -154,7 +154,8 @@ int __init ima_init(void)
ima_init_key_queue();
ima_measure_critical_data("kernel_info", "kernel_version",
- UTS_RELEASE, strlen(UTS_RELEASE), false);
+ UTS_RELEASE, strlen(UTS_RELEASE), false,
+ NULL, 0);
return rc;
}