diff options
Diffstat (limited to 'security/integrity/ima/ima_queue.c')
-rw-r--r-- | security/integrity/ima/ima_queue.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c index ff63fe00c195..d85e99761f4f 100644 --- a/security/integrity/ima/ima_queue.c +++ b/security/integrity/ima/ima_queue.c | |||
@@ -50,7 +50,7 @@ static struct ima_queue_entry *ima_lookup_digest_entry(u8 *digest_value) | |||
50 | key = ima_hash_key(digest_value); | 50 | key = ima_hash_key(digest_value); |
51 | rcu_read_lock(); | 51 | rcu_read_lock(); |
52 | hlist_for_each_entry_rcu(qe, &ima_htable.queue[key], hnext) { | 52 | hlist_for_each_entry_rcu(qe, &ima_htable.queue[key], hnext) { |
53 | rc = memcmp(qe->entry->digest, digest_value, IMA_DIGEST_SIZE); | 53 | rc = memcmp(qe->entry->digest, digest_value, TPM_DIGEST_SIZE); |
54 | if (rc == 0) { | 54 | if (rc == 0) { |
55 | ret = qe; | 55 | ret = qe; |
56 | break; | 56 | break; |
@@ -104,9 +104,10 @@ static int ima_pcr_extend(const u8 *hash) | |||
104 | * and extend the pcr. | 104 | * and extend the pcr. |
105 | */ | 105 | */ |
106 | int ima_add_template_entry(struct ima_template_entry *entry, int violation, | 106 | int ima_add_template_entry(struct ima_template_entry *entry, int violation, |
107 | const char *op, struct inode *inode) | 107 | const char *op, struct inode *inode, |
108 | const unsigned char *filename) | ||
108 | { | 109 | { |
109 | u8 digest[IMA_DIGEST_SIZE]; | 110 | u8 digest[TPM_DIGEST_SIZE]; |
110 | const char *audit_cause = "hash_added"; | 111 | const char *audit_cause = "hash_added"; |
111 | char tpm_audit_cause[AUDIT_CAUSE_LEN_MAX]; | 112 | char tpm_audit_cause[AUDIT_CAUSE_LEN_MAX]; |
112 | int audit_info = 1; | 113 | int audit_info = 1; |
@@ -141,8 +142,7 @@ int ima_add_template_entry(struct ima_template_entry *entry, int violation, | |||
141 | } | 142 | } |
142 | out: | 143 | out: |
143 | mutex_unlock(&ima_extend_list_mutex); | 144 | mutex_unlock(&ima_extend_list_mutex); |
144 | integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode, | 145 | integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode, filename, |
145 | entry->template.file_name, | ||
146 | op, audit_cause, result, audit_info); | 146 | op, audit_cause, result, audit_info); |
147 | return result; | 147 | return result; |
148 | } | 148 | } |