diff options
author | Eric Richter | 2016-06-01 20:14:03 +0200 |
---|---|---|
committer | Mimi Zohar | 2016-06-30 07:14:21 +0200 |
commit | 14b1da85bbe9a59c5e01123a06dea4c4758a6db9 (patch) | |
tree | 1a61fea1cd6101588305467af50337d414420b4f /security/integrity/ima/ima_main.c | |
parent | ima: extend ima_get_action() to return the policy pcr (diff) | |
download | kernel-qcow2-linux-14b1da85bbe9a59c5e01123a06dea4c4758a6db9.tar.gz kernel-qcow2-linux-14b1da85bbe9a59c5e01123a06dea4c4758a6db9.tar.xz kernel-qcow2-linux-14b1da85bbe9a59c5e01123a06dea4c4758a6db9.zip |
ima: include pcr for each measurement log entry
The IMA measurement list entries include the Kconfig defined PCR value.
This patch defines a new ima_template_entry field for including the PCR
as specified in the policy rule.
Signed-off-by: Eric Richter <erichte@linux.vnet.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_main.c')
-rw-r--r-- | security/integrity/ima/ima_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 58b08b25437a..3627afdc932e 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -239,7 +239,7 @@ static int process_measurement(struct file *file, char *buf, loff_t size, if (action & IMA_MEASURE) ima_store_measurement(iint, file, pathname, - xattr_value, xattr_len); + xattr_value, xattr_len, pcr); if (action & IMA_APPRAISE_SUBMASK) rc = ima_appraise_measurement(func, iint, file, pathname, xattr_value, xattr_len, opened); |