Re: [PATCH v3] IMA: Add audit log for failure conditions
On 6/9/20 10:35 AM, Steve Grubb wrote: If it is added, it should be appended to the end of the record since it is an existing record format, then in the case of res=1, errno= should still be present (not swing in and out) and just contain zero. (Or another value if there is a non-fatal warning?) This is not a searchable field, so it can go anywhere. If it is searchable, ausearch expects ordering of other searchable fields. Thank you for the clarification Steve. I'll add "errno=" right after "cause=". Also, "errno" will always be present - will be set to 0 if status is "success" (res=1) and a non-zero value for failure (res=0) thanks, -lakshmi
Re: [PATCH v3] IMA: Add audit log for failure conditions
On Tuesday, June 9, 2020 1:15:55 PM EDT Richard Guy Briggs wrote: > On 2020-06-09 10:00, Lakshmi Ramasubramanian wrote: > > On 6/9/20 9:43 AM, Steve Grubb wrote: > > > > The number in parenthesis is the error code (such as ENOMEM, EINVAL, > > > > etc.) IMA uses this format for reporting TPM errors in one of the > > > > audit > > > > messages (In ima_add_template_entry()). I followed the same pattern. > > > > > > > > Would it be better if the value for "cause" is formatted as > > > > > > > > cause=hashing_error_-22 > > > > > > > > cause=alloc_entry_-12 > > > > > > Neither fit the name=value style that all other events follow. What > > > would fit the style is something like this: > > > > > > cause=hashing_error errno=-22 > > > cause=alloc_entry errno=-12 > > > > > > Would this be OK? Also, errno is only to illustrate. You can name it > > > something else as long as there are no use case collisions with our > > > dictionary of field names. > > > > > > https://github.com/linux-audit/audit-documentation/blob/master/specs/fi > > > elds/ field-dictionary.csv > > > > I am fine with this. Thanks, this makes interpreting it a couple lines of code. > > "errno" is currently not listed in the dictionary of audit message field > > names (Thanks for the pointer to this one Steve) It can be easily added. > > Mimi - please let me know if you have any concerns with adding the > > "result" code in "errno" field in integrity_audit_msg(). > > If it is added, it should be appended to the end of the record since it > is an existing record format, then in the case of res=1, errno= should > still be present (not swing in and out) and just contain zero. (Or > another value if there is a non-fatal warning?) This is not a searchable field, so it can go anywhere. If it is searchable, ausearch expects ordering of other searchable fields. -Steve
Re: [PATCH v3] IMA: Add audit log for failure conditions
Hi Richard, On Tue, 2020-06-09 at 13:15 -0400, Richard Guy Briggs wrote: > On 2020-06-09 10:00, Lakshmi Ramasubramanian wrote: > If it is added, it should be appended to the end of the record since it > is an existing record format, then in the case of res=1, errno= should > still be present (not swing in and out) and just contain zero. (Or > another value if there is a non-fatal warning?) Thank you for the clarification. Mimi
Re: [PATCH v3] IMA: Add audit log for failure conditions
On 2020-06-09 10:00, Lakshmi Ramasubramanian wrote: > On 6/9/20 9:43 AM, Steve Grubb wrote: > > > > The number in parenthesis is the error code (such as ENOMEM, EINVAL, > > > etc.) IMA uses this format for reporting TPM errors in one of the audit > > > messages (In ima_add_template_entry()). I followed the same pattern. > > > > > > Would it be better if the value for "cause" is formatted as > > > > > > cause=hashing_error_-22 > > > > > > cause=alloc_entry_-12 > > > > Neither fit the name=value style that all other events follow. What would > > fit > > the style is something like this: > > > > cause=hashing_error errno=-22 > > cause=alloc_entry errno=-12 > > > > Would this be OK? Also, errno is only to illustrate. You can name it > > something else as long as there are no use case collisions with our > > dictionary of field names. > > > > https://github.com/linux-audit/audit-documentation/blob/master/specs/fields/ > > field-dictionary.csv > > I am fine with this. > > "errno" is currently not listed in the dictionary of audit message field > names (Thanks for the pointer to this one Steve) > > Mimi - please let me know if you have any concerns with adding the "result" > code in "errno" field in integrity_audit_msg(). If it is added, it should be appended to the end of the record since it is an existing record format, then in the case of res=1, errno= should still be present (not swing in and out) and just contain zero. (Or another value if there is a non-fatal warning?) > Sample message: > > [8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0 > auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0 > op=measuring_keys cause=hashing_error errno=-22 comm="systemd" > name=".builtin_trusted_keys" res=0 > > thanks, > -lakshmi - RGB -- Richard Guy Briggs Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada IRC: rgb, SunRaycer Voice: +1.647.777.2635, Internal: (81) 32635
Re: [PATCH v3] IMA: Add audit log for failure conditions
On Tue, 2020-06-09 at 10:00 -0700, Lakshmi Ramasubramanian wrote: > On 6/9/20 9:43 AM, Steve Grubb wrote: > > >> The number in parenthesis is the error code (such as ENOMEM, EINVAL, > >> etc.) IMA uses this format for reporting TPM errors in one of the audit > >> messages (In ima_add_template_entry()). I followed the same pattern. > >> > >> Would it be better if the value for "cause" is formatted as > >> > >> cause=hashing_error_-22 > >> > >> cause=alloc_entry_-12 > > > > Neither fit the name=value style that all other events follow. What would > > fit > > the style is something like this: > > > > cause=hashing_error errno=-22 > > > > cause=alloc_entry errno=-12 > > > > Would this be OK? Also, errno is only to illustrate. You can name it > > something else as long as there are no use case collisions with our > > dictionary of field names. > > > > https://github.com/linux-audit/audit-documentation/blob/master/specs/fields/ > > field-dictionary.csv > > I am fine with this. > > "errno" is currently not listed in the dictionary of audit message field > names (Thanks for the pointer to this one Steve) > > Mimi - please let me know if you have any concerns with adding the > "result" code in "errno" field in integrity_audit_msg(). > > Sample message: > > [8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0 > auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0 > op=measuring_keys cause=hashing_error errno=-22 comm="systemd" > name=".builtin_trusted_keys" res=0 Yes, that's fine. Mimi
Re: [PATCH v3] IMA: Add audit log for failure conditions
On Mon, 2020-06-08 at 14:53 -0700, Lakshmi Ramasubramanian wrote:
> The final log statement in process_buffer_measurement() for failure
> condition is at debug level. This does not log the message unless
> the system log level is raised which would significantly increase
> the messages in the system log. Change this log message to an audit
> message for better triaging failures in the function.
We need to differentiate between emitting the error number for
debugging purposes and auditing integrity failures. The purpose of
this patch should be to audit integrity failures. Please update the
patch description.
(Including the "errno" as Steve suggested would be fine.)
>
> out:
> - if (ret < 0)
> - pr_devel("%s: failed, result: %d\n", __func__, ret);
> + if (ret < 0) {
> + snprintf(measurement_audit_cause, AUDIT_CAUSE_LEN_MAX,
> + "%s(%d)", audit_cause, ret);
Please remove this.
> +
> + switch (func) {
> + case KEXEC_CMDLINE:
> + op = "measuring_kexec_cmdline";
> + break;
> + case KEY_CHECK:
> + op = "measuring_keys";
> + break;
> + default:
> + op = "measuring_blacklisted_hash";
> + break;
> + }
Instead of a switch, define a string array based on func.
> +
> + integrity_audit_msg(AUDIT_INTEGRITY_PCR, NULL, eventname,
> + op, measurement_audit_cause, ret, 0);
Use "audit_cause".
thanks,
Mimi
> + }
Re: [PATCH v3] IMA: Add audit log for failure conditions
On 6/9/20 9:43 AM, Steve Grubb wrote: The number in parenthesis is the error code (such as ENOMEM, EINVAL, etc.) IMA uses this format for reporting TPM errors in one of the audit messages (In ima_add_template_entry()). I followed the same pattern. Would it be better if the value for "cause" is formatted as cause=hashing_error_-22 cause=alloc_entry_-12 Neither fit the name=value style that all other events follow. What would fit the style is something like this: cause=hashing_error errno=-22 cause=alloc_entry errno=-12 Would this be OK? Also, errno is only to illustrate. You can name it something else as long as there are no use case collisions with our dictionary of field names. https://github.com/linux-audit/audit-documentation/blob/master/specs/fields/ field-dictionary.csv I am fine with this. "errno" is currently not listed in the dictionary of audit message field names (Thanks for the pointer to this one Steve) Mimi - please let me know if you have any concerns with adding the "result" code in "errno" field in integrity_audit_msg(). Sample message: [8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0 auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0 op=measuring_keys cause=hashing_error errno=-22 comm="systemd" name=".builtin_trusted_keys" res=0 thanks, -lakshmi
Re: [PATCH v3] IMA: Add audit log for failure conditions
Hello, On Tuesday, June 9, 2020 11:58:02 AM EDT Lakshmi Ramasubramanian wrote: > On 6/9/20 8:40 AM, Steve Grubb wrote: > > On Monday, June 8, 2020 5:53:43 PM EDT Lakshmi Ramasubramanian wrote: > >> The final log statement in process_buffer_measurement() for failure > >> condition is at debug level. This does not log the message unless > >> the system log level is raised which would significantly increase > >> the messages in the system log. Change this log message to an audit > >> message for better triaging failures in the function. > >> > >> ima_alloc_key_entry() does not log a message for failure condition. > >> Add an audit message for failure condition in this function. > > > >> Sample audit messages: > > Wouldn't it be better to have an IMA_ERROR record type? > > type "1804" is AUDIT_INTEGRITY_PCR which is used for failures to add to > the measurement list. > > >> [8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0 > >> auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0 > >> op=measuring_keys cause=hashing_error(-22) > > > > The audit system uses a name=value scheme to express information. This > > last field has something in parenthesis that may need to be interpreted. > > In its current form, we can't do this. It would require writing code to > > special case this event, go to this field, find the first parenthesis, > > find the second, extract what's between, and look it up. > > > > It would be better if that number in parenthesis was normalized to the > > expected way we do audit events so nothing special has to be made. > > The number in parenthesis is the error code (such as ENOMEM, EINVAL, > etc.) IMA uses this format for reporting TPM errors in one of the audit > messages (In ima_add_template_entry()). I followed the same pattern. > > Would it be better if the value for "cause" is formatted as > > cause=hashing_error_-22 > > cause=alloc_entry_-12 Neither fit the name=value style that all other events follow. What would fit the style is something like this: cause=hashing_error errno=-22 cause=alloc_entry errno=-12 Would this be OK? Also, errno is only to illustrate. You can name it something else as long as there are no use case collisions with our dictionary of field names. https://github.com/linux-audit/audit-documentation/blob/master/specs/fields/ field-dictionary.csv -Steve
Re: [PATCH v3] IMA: Add audit log for failure conditions
On 6/9/20 8:40 AM, Steve Grubb wrote: On Monday, June 8, 2020 5:53:43 PM EDT Lakshmi Ramasubramanian wrote: The final log statement in process_buffer_measurement() for failure condition is at debug level. This does not log the message unless the system log level is raised which would significantly increase the messages in the system log. Change this log message to an audit message for better triaging failures in the function. ima_alloc_key_entry() does not log a message for failure condition. Add an audit message for failure condition in this function. Sample audit messages: Wouldn't it be better to have an IMA_ERROR record type? type "1804" is AUDIT_INTEGRITY_PCR which is used for failures to add to the measurement list. [8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0 auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0 op=measuring_keys cause=hashing_error(-22) The audit system uses a name=value scheme to express information. This last field has something in parenthesis that may need to be interpreted. In its current form, we can't do this. It would require writing code to special case this event, go to this field, find the first parenthesis, find the second, extract what's between, and look it up. It would be better if that number in parenthesis was normalized to the expected way we do audit events so nothing special has to be made. The number in parenthesis is the error code (such as ENOMEM, EINVAL, etc.) IMA uses this format for reporting TPM errors in one of the audit messages (In ima_add_template_entry()). I followed the same pattern. Would it be better if the value for "cause" is formatted as cause=hashing_error_-22 cause=alloc_entry_-12 thanks, -lakshmi
Re: [PATCH v3] IMA: Add audit log for failure conditions
On Monday, June 8, 2020 5:53:43 PM EDT Lakshmi Ramasubramanian wrote:
> The final log statement in process_buffer_measurement() for failure
> condition is at debug level. This does not log the message unless
> the system log level is raised which would significantly increase
> the messages in the system log. Change this log message to an audit
> message for better triaging failures in the function.
>
> ima_alloc_key_entry() does not log a message for failure condition.
> Add an audit message for failure condition in this function.
>
> Sample audit messages:
Wouldn't it be better to have an IMA_ERROR record type?
> [8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0
> auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0
> op=measuring_keys cause=hashing_error(-22)
The audit system uses a name=value scheme to express information. This last
field has something in parenthesis that may need to be interpreted. In its
current form, we can't do this. It would require writing code to special case
this event, go to this field, find the first parenthesis, find the second,
extract what's between, and look it up.
It would be better if that number in parenthesis was normalized to the
expected way we do audit events so nothing special has to be made.
-Steve
> comm="systemd"
> name=".builtin_trusted_keys" res=0
>
> [8.063218] audit: type=1804 audit(1591633422.377:9): pid=1 uid=0
> auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0
> op=measuring_kexec_cmdline cause=alloc_entry(-12) comm="systemd"
> name="kexec-cmdline" res=0
>
> Signed-off-by: Lakshmi Ramasubramanian
> ---
> security/integrity/ima/ima.h| 2 ++
> security/integrity/ima/ima_main.c | 37 +
> security/integrity/ima/ima_queue.c | 2 --
> security/integrity/ima/ima_queue_keys.c | 4 +++
> 4 files changed, 37 insertions(+), 8 deletions(-)
>
> diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
> index df93ac258e01..8a47249c6238 100644
> --- a/security/integrity/ima/ima.h
> +++ b/security/integrity/ima/ima.h
> @@ -47,6 +47,8 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
>
> #define NR_BANKS(chip) ((chip != NULL) ? chip->nr_allocated_banks : 0)
>
> +#define AUDIT_CAUSE_LEN_MAX 32
> +
> /* current content of the policy */
> extern int ima_policy_flag;
>
> diff --git a/security/integrity/ima/ima_main.c
> b/security/integrity/ima/ima_main.c index 800fb3bba418..b10f09bc7eca
> 100644
> --- a/security/integrity/ima/ima_main.c
> +++ b/security/integrity/ima/ima_main.c
> @@ -739,6 +739,9 @@ void process_buffer_measurement(const void *buf, int
> size, int pcr, const char *keyring)
> {
> int ret = 0;
> + const char *audit_cause = "ENOMEM";
> + const char *op = "measuring_keys";
> + char measurement_audit_cause[AUDIT_CAUSE_LEN_MAX];
> struct ima_template_entry *entry = NULL;
> struct integrity_iint_cache iint = {};
> struct ima_event_data event_data = {.iint = ,
> @@ -793,21 +796,43 @@ void process_buffer_measurement(const void *buf, int
> size, iint.ima_hash->length = hash_digest_size[ima_hash_algo];
>
> ret = ima_calc_buffer_hash(buf, size, iint.ima_hash);
> - if (ret < 0)
> + if (ret < 0) {
> + audit_cause = "hashing_error";
> goto out;
> + }
>
> ret = ima_alloc_init_template(_data, , template);
> - if (ret < 0)
> + if (ret < 0) {
> + audit_cause = "alloc_entry";
> goto out;
> + }
>
> ret = ima_store_template(entry, violation, NULL, buf, pcr);
> -
> - if (ret < 0)
> + if (ret < 0) {
> + audit_cause = "store_entry";
> ima_free_template_entry(entry);
> + }
>
> out:
> - if (ret < 0)
> - pr_devel("%s: failed, result: %d\n", __func__, ret);
> + if (ret < 0) {
> + snprintf(measurement_audit_cause, AUDIT_CAUSE_LEN_MAX,
> + "%s(%d)", audit_cause, ret);
> +
> + switch (func) {
> + case KEXEC_CMDLINE:
> + op = "measuring_kexec_cmdline";
> + break;
> + case KEY_CHECK:
> + op = "measuring_keys";
> + break;
> + default:
> + op = "measuring_blacklisted_hash";
> + break;
> + }
> +
> + integrity_audit_msg(AUDIT_INTEGRITY_PCR, NULL, eventname,
> + op, measurement_audit_cause, ret, 0);
> + }
>
> return;
> }
> diff --git a/security/integrity/ima/ima_queue.c
> b/security/integrity/ima/ima_queue.c index fb4ec270f620..4a761d765c6c
> 100644
> --- a/security/integrity/ima/ima_queue.c
> +++ b/security/integrity/ima/ima_queue.c
> @@ -19,8 +19,6 @@
> #include
> #include "ima.h"
>
> -#define AUDIT_CAUSE_LEN_MAX 32
> -
> /* pre-allocated array of tpm_digest structures to extend a PCR */
> static
Re: [PATCH v3] IMA: Add audit log for failure conditions
On 2020-06-08 14:53, Lakshmi Ramasubramanian wrote:
> The final log statement in process_buffer_measurement() for failure
> condition is at debug level. This does not log the message unless
> the system log level is raised which would significantly increase
> the messages in the system log. Change this log message to an audit
> message for better triaging failures in the function.
>
> ima_alloc_key_entry() does not log a message for failure condition.
> Add an audit message for failure condition in this function.
>
> Sample audit messages:
>
> [8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0
> auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0
> op=measuring_keys cause=hashing_error(-22) comm="systemd"
> name=".builtin_trusted_keys" res=0
>
> [8.063218] audit: type=1804 audit(1591633422.377:9): pid=1 uid=0
> auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0
> op=measuring_kexec_cmdline cause=alloc_entry(-12) comm="systemd"
> name="kexec-cmdline" res=0
>
> Signed-off-by: Lakshmi Ramasubramanian
Reviewed-by: Richard Guy Briggs
> ---
> security/integrity/ima/ima.h| 2 ++
> security/integrity/ima/ima_main.c | 37 +
> security/integrity/ima/ima_queue.c | 2 --
> security/integrity/ima/ima_queue_keys.c | 4 +++
> 4 files changed, 37 insertions(+), 8 deletions(-)
>
> diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
> index df93ac258e01..8a47249c6238 100644
> --- a/security/integrity/ima/ima.h
> +++ b/security/integrity/ima/ima.h
> @@ -47,6 +47,8 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
>
> #define NR_BANKS(chip) ((chip != NULL) ? chip->nr_allocated_banks : 0)
>
> +#define AUDIT_CAUSE_LEN_MAX 32
> +
> /* current content of the policy */
> extern int ima_policy_flag;
>
> diff --git a/security/integrity/ima/ima_main.c
> b/security/integrity/ima/ima_main.c
> index 800fb3bba418..b10f09bc7eca 100644
> --- a/security/integrity/ima/ima_main.c
> +++ b/security/integrity/ima/ima_main.c
> @@ -739,6 +739,9 @@ void process_buffer_measurement(const void *buf, int size,
> int pcr, const char *keyring)
> {
> int ret = 0;
> + const char *audit_cause = "ENOMEM";
> + const char *op = "measuring_keys";
> + char measurement_audit_cause[AUDIT_CAUSE_LEN_MAX];
> struct ima_template_entry *entry = NULL;
> struct integrity_iint_cache iint = {};
> struct ima_event_data event_data = {.iint = ,
> @@ -793,21 +796,43 @@ void process_buffer_measurement(const void *buf, int
> size,
> iint.ima_hash->length = hash_digest_size[ima_hash_algo];
>
> ret = ima_calc_buffer_hash(buf, size, iint.ima_hash);
> - if (ret < 0)
> + if (ret < 0) {
> + audit_cause = "hashing_error";
> goto out;
> + }
>
> ret = ima_alloc_init_template(_data, , template);
> - if (ret < 0)
> + if (ret < 0) {
> + audit_cause = "alloc_entry";
> goto out;
> + }
>
> ret = ima_store_template(entry, violation, NULL, buf, pcr);
> -
> - if (ret < 0)
> + if (ret < 0) {
> + audit_cause = "store_entry";
> ima_free_template_entry(entry);
> + }
>
> out:
> - if (ret < 0)
> - pr_devel("%s: failed, result: %d\n", __func__, ret);
> + if (ret < 0) {
> + snprintf(measurement_audit_cause, AUDIT_CAUSE_LEN_MAX,
> + "%s(%d)", audit_cause, ret);
> +
> + switch (func) {
> + case KEXEC_CMDLINE:
> + op = "measuring_kexec_cmdline";
> + break;
> + case KEY_CHECK:
> + op = "measuring_keys";
> + break;
> + default:
> + op = "measuring_blacklisted_hash";
> + break;
> + }
> +
> + integrity_audit_msg(AUDIT_INTEGRITY_PCR, NULL, eventname,
> + op, measurement_audit_cause, ret, 0);
> + }
>
> return;
> }
> diff --git a/security/integrity/ima/ima_queue.c
> b/security/integrity/ima/ima_queue.c
> index fb4ec270f620..4a761d765c6c 100644
> --- a/security/integrity/ima/ima_queue.c
> +++ b/security/integrity/ima/ima_queue.c
> @@ -19,8 +19,6 @@
> #include
> #include "ima.h"
>
> -#define AUDIT_CAUSE_LEN_MAX 32
> -
> /* pre-allocated array of tpm_digest structures to extend a PCR */
> static struct tpm_digest *digests;
>
> diff --git a/security/integrity/ima/ima_queue_keys.c
> b/security/integrity/ima/ima_queue_keys.c
> index cb3e3f501593..4de31ff172aa 100644
> --- a/security/integrity/ima/ima_queue_keys.c
> +++ b/security/integrity/ima/ima_queue_keys.c
> @@ -68,6 +68,7 @@ static struct ima_key_entry *ima_alloc_key_entry(struct key
> *keyring,
>size_t payload_len)
> {
> int rc = 0;
> + const char
[PATCH v3] IMA: Add audit log for failure conditions
The final log statement in process_buffer_measurement() for failure
condition is at debug level. This does not log the message unless
the system log level is raised which would significantly increase
the messages in the system log. Change this log message to an audit
message for better triaging failures in the function.
ima_alloc_key_entry() does not log a message for failure condition.
Add an audit message for failure condition in this function.
Sample audit messages:
[8.051937] audit: type=1804 audit(1591633422.365:8): pid=1 uid=0
auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0
op=measuring_keys cause=hashing_error(-22) comm="systemd"
name=".builtin_trusted_keys" res=0
[8.063218] audit: type=1804 audit(1591633422.377:9): pid=1 uid=0
auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0
op=measuring_kexec_cmdline cause=alloc_entry(-12) comm="systemd"
name="kexec-cmdline" res=0
Signed-off-by: Lakshmi Ramasubramanian
---
security/integrity/ima/ima.h| 2 ++
security/integrity/ima/ima_main.c | 37 +
security/integrity/ima/ima_queue.c | 2 --
security/integrity/ima/ima_queue_keys.c | 4 +++
4 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index df93ac258e01..8a47249c6238 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -47,6 +47,8 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
#define NR_BANKS(chip) ((chip != NULL) ? chip->nr_allocated_banks : 0)
+#define AUDIT_CAUSE_LEN_MAX 32
+
/* current content of the policy */
extern int ima_policy_flag;
diff --git a/security/integrity/ima/ima_main.c
b/security/integrity/ima/ima_main.c
index 800fb3bba418..b10f09bc7eca 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -739,6 +739,9 @@ void process_buffer_measurement(const void *buf, int size,
int pcr, const char *keyring)
{
int ret = 0;
+ const char *audit_cause = "ENOMEM";
+ const char *op = "measuring_keys";
+ char measurement_audit_cause[AUDIT_CAUSE_LEN_MAX];
struct ima_template_entry *entry = NULL;
struct integrity_iint_cache iint = {};
struct ima_event_data event_data = {.iint = ,
@@ -793,21 +796,43 @@ void process_buffer_measurement(const void *buf, int size,
iint.ima_hash->length = hash_digest_size[ima_hash_algo];
ret = ima_calc_buffer_hash(buf, size, iint.ima_hash);
- if (ret < 0)
+ if (ret < 0) {
+ audit_cause = "hashing_error";
goto out;
+ }
ret = ima_alloc_init_template(_data, , template);
- if (ret < 0)
+ if (ret < 0) {
+ audit_cause = "alloc_entry";
goto out;
+ }
ret = ima_store_template(entry, violation, NULL, buf, pcr);
-
- if (ret < 0)
+ if (ret < 0) {
+ audit_cause = "store_entry";
ima_free_template_entry(entry);
+ }
out:
- if (ret < 0)
- pr_devel("%s: failed, result: %d\n", __func__, ret);
+ if (ret < 0) {
+ snprintf(measurement_audit_cause, AUDIT_CAUSE_LEN_MAX,
+"%s(%d)", audit_cause, ret);
+
+ switch (func) {
+ case KEXEC_CMDLINE:
+ op = "measuring_kexec_cmdline";
+ break;
+ case KEY_CHECK:
+ op = "measuring_keys";
+ break;
+ default:
+ op = "measuring_blacklisted_hash";
+ break;
+ }
+
+ integrity_audit_msg(AUDIT_INTEGRITY_PCR, NULL, eventname,
+ op, measurement_audit_cause, ret, 0);
+ }
return;
}
diff --git a/security/integrity/ima/ima_queue.c
b/security/integrity/ima/ima_queue.c
index fb4ec270f620..4a761d765c6c 100644
--- a/security/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
@@ -19,8 +19,6 @@
#include
#include "ima.h"
-#define AUDIT_CAUSE_LEN_MAX 32
-
/* pre-allocated array of tpm_digest structures to extend a PCR */
static struct tpm_digest *digests;
diff --git a/security/integrity/ima/ima_queue_keys.c
b/security/integrity/ima/ima_queue_keys.c
index cb3e3f501593..4de31ff172aa 100644
--- a/security/integrity/ima/ima_queue_keys.c
+++ b/security/integrity/ima/ima_queue_keys.c
@@ -68,6 +68,7 @@ static struct ima_key_entry *ima_alloc_key_entry(struct key
*keyring,
size_t payload_len)
{
int rc = 0;
+ const char *audit_cause = "ENOMEM";
struct ima_key_entry *entry;
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
@@ -88,6 +89,9 @@ static struct ima_key_entry *ima_alloc_key_entry(struct key
*keyring,
out:
if (rc) {
+
