| Message ID | 20240214153827.1087657-7-tusharsu@linux.microsoft.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ima: kexec: measure events between kexec load and execute | expand |
Hi Tushar, On Wed, 2024-02-14 at 07:38 -0800, Tushar Sugandhi wrote: > New measurements added to the IMA log while the log is being copied > during the kexec 'execute' may not get copied over. As long as there is enough memory for the additional records, isn't the problem "after" copying the mesaurement list records, not during? > This can cause the > measurement log to be out of sync with the TPM PCRs that IMA extends, > which could result in breaking the integrity of the measurements after > kexec soft reboot. > > Implement and call the functions ima_measurements_suspend() and > ima_measurements_resume() from ima_update_kexec_buffer(). After copying the measurement list records, would not be the time to resume taking additional measurements. > Add a check in the ima_add_template_entry() function not to measure > events when 'suspend_ima_measurements' flag is set. > > This ensures the integrity of the IMA log while it is being copied over > to the new Kernel during kexec 'execute'. > > Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> > --- > security/integrity/ima/ima.h | 2 ++ > security/integrity/ima/ima_kexec.c | 7 +++++++ > security/integrity/ima/ima_queue.c | 32 ++++++++++++++++++++++++++++++ > 3 files changed, 41 insertions(+) > > diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h > index c29db699c996..49a6047dd8eb 100644 > --- a/security/integrity/ima/ima.h > +++ b/security/integrity/ima/ima.h > @@ -161,6 +161,8 @@ bool ima_template_has_modsig(const struct > ima_template_desc *ima_template); > int ima_restore_measurement_entry(struct ima_template_entry *entry); > int ima_restore_measurement_list(loff_t bufsize, void *buf); > int ima_measurements_show(struct seq_file *m, void *v); > +void ima_measurements_suspend(void); > +void ima_measurements_resume(void); > unsigned long ima_get_binary_runtime_size(void); > int ima_init_template(void); > void ima_init_template_list(void); > diff --git a/security/integrity/ima/ima_kexec.c > b/security/integrity/ima/ima_kexec.c > index 98fc9b9782a2..dbeeb7f1355e 100644 > --- a/security/integrity/ima/ima_kexec.c > +++ b/security/integrity/ima/ima_kexec.c > @@ -184,6 +184,7 @@ static int ima_update_kexec_buffer(struct notifier_block > *self, > void *buf = NULL; > size_t buf_size; > int ret = NOTIFY_OK; > + bool resume = false; > > if (!kexec_in_progress) { > pr_info("%s: No kexec in progress.\n", __func__); > @@ -195,12 +196,15 @@ static int ima_update_kexec_buffer(struct notifier_block > *self, > return ret; > } > > + ima_measurements_suspend(); > + > ret = ima_dump_measurement_list(&buf_size, &buf, > kexec_segment_size); > > if (!buf) { > pr_err("%s: Dump measurements failed. Error:%d\n", > __func__, ret); > + resume = true; Only on failure to copy the measurement list records will measurements be "resumed". Measurements will be suspended from when the IMA reboot notifier is called until reboot. The patch suject line, description and comments don't match the code. There is no "during buffer copy" in "ima: suspend measurements during buffer copy at kexec execute". Measurements are suspended. The question is whether you could suspend measurements a bit later, just after copying the measurement records. > goto out; > } > memcpy(ima_kexec_buffer, buf, buf_size); > @@ -208,6 +212,9 @@ static int ima_update_kexec_buffer(struct notifier_block > *self, > kimage_unmap_segment(ima_kexec_buffer); > ima_kexec_buffer = NULL; > > + if (resume) > + ima_measurements_resume(); > + What is the point in resuming the measurement list on failure to copy them? > return ret; > } > > diff --git a/security/integrity/ima/ima_queue.c > b/security/integrity/ima/ima_queue.c > index 532da87ce519..5946a26a2849 100644 > --- a/security/integrity/ima/ima_queue.c > +++ b/security/integrity/ima/ima_queue.c > @@ -44,6 +44,11 @@ struct ima_h_table ima_htable = { > */ > static DEFINE_MUTEX(ima_extend_list_mutex); > > +/* > + * Used internally by the kernel to suspend-resume ima measurements. > + */ > +static atomic_t suspend_ima_measurements; > + > /* lookup up the digest value in the hash table, and return the entry */ > static struct ima_queue_entry *ima_lookup_digest_entry(u8 *digest_value, > int pcr) > @@ -148,6 +153,20 @@ static int ima_pcr_extend(struct tpm_digest *digests_arg, > int pcr) > return result; > } > > +void ima_measurements_suspend(void) > +{ > + mutex_lock(&ima_extend_list_mutex); > + atomic_set(&suspend_ima_measurements, 1); > + mutex_unlock(&ima_extend_list_mutex); > +} > + > +void ima_measurements_resume(void) > +{ > + mutex_lock(&ima_extend_list_mutex); > + atomic_set(&suspend_ima_measurements, 0); > + mutex_unlock(&ima_extend_list_mutex); > +} > + > /* > * Add template entry to the measurement list and hash table, and > * extend the pcr. > @@ -176,6 +195,19 @@ int ima_add_template_entry(struct ima_template_entry > *entry, int violation, > } > } > > + /* > + * suspend_ima_measurements will be set if the system is > + * undergoing kexec soft boot to a new kernel. > + * suspending measurements in this short window ensures the > + * consistency of the IMA measurement list during copying > + * of the kexec buffer. > + */ Either remove the 2nd sentence "suspending measurements in this short window ..." or explain what is meant by "short window". Mimi > + if (atomic_read(&suspend_ima_measurements)) { > + audit_cause = "measurements_suspended"; > + audit_info = 0; > + goto out; > + } > + > result = ima_add_digest_entry(entry, > !IS_ENABLED(CONFIG_IMA_DISABLE_HTABLE)); > if (result < 0) {
> > @@ -176,6 +195,19 @@ int ima_add_template_entry(struct ima_template_entry > > *entry, int violation, > > } > > } > > > > + /* > > + * suspend_ima_measurements will be set if the system is > > + * undergoing kexec soft boot to a new kernel. > > + * suspending measurements in this short window ensures the > > + * consistency of the IMA measurement list during copying > > + * of the kexec buffer. > > + */ > > Either remove the 2nd sentence "suspending measurements in this short window > ..." or explain what is meant by "short window". > > > > + if (atomic_read(&suspend_ima_measurements)) { > > + audit_cause = "measurements_suspended"; > > + audit_info = 0; > > + goto out; After the suggested changes, understanding how many measurements are not being added to the measurement list and not being extended into the TPM would be really interesting. Mimi > > + } > > + > > result = ima_add_digest_entry(entry, > > !IS_ENABLED(CONFIG_IMA_DISABLE_HTABLE)); > > if (result < 0) { > >
On Thu, 22 Feb 2024 11:38:23 -0500 Mimi Zohar <zohar@linux.ibm.com> wrote: > > > @@ -176,6 +195,19 @@ int ima_add_template_entry(struct ima_template_entry > > > *entry, int violation, > > > } > > > } > > > > > > + /* > > > + * suspend_ima_measurements will be set if the system is > > > + * undergoing kexec soft boot to a new kernel. > > > + * suspending measurements in this short window ensures the > > > + * consistency of the IMA measurement list during copying > > > + * of the kexec buffer. > > > + */ > > > > Either remove the 2nd sentence "suspending measurements in this short window > > ..." or explain what is meant by "short window". > > > > > > > + if (atomic_read(&suspend_ima_measurements)) { > > > + audit_cause = "measurements_suspended"; > > > + audit_info = 0; > > > + goto out; > > After the suggested changes, understanding how many measurements are not being > added to the measurement list and not being extended into the TPM would be > really interesting. First, I'm sorry for chiming in when v5 is already around, but I have just found this patch series now. It indeed sounds conceptually wrong to suspend and resume measurements. At some point during the handover, other CPUs are taken offline (look for migrate_to_reboot_cpu() in kernel/kexec_core.c) and even the reboot CPU will be sufficiently shut down as not to be able to add any more measurements. IMO it would make more sense to copy the measurement list at this late stage, even if it means adding a new notifier list (or a new action). It may be a bit challenging if you want to make 100% sure that a new measurement cannot be made from hard interrupt context, but is that even a supported scenario? Just my two (euro)cents, Petr T
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c29db699c996..49a6047dd8eb 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -161,6 +161,8 @@ bool ima_template_has_modsig(const struct ima_template_desc *ima_template); int ima_restore_measurement_entry(struct ima_template_entry *entry); int ima_restore_measurement_list(loff_t bufsize, void *buf); int ima_measurements_show(struct seq_file *m, void *v); +void ima_measurements_suspend(void); +void ima_measurements_resume(void); unsigned long ima_get_binary_runtime_size(void); int ima_init_template(void); void ima_init_template_list(void); diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 98fc9b9782a2..dbeeb7f1355e 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -184,6 +184,7 @@ static int ima_update_kexec_buffer(struct notifier_block *self, void *buf = NULL; size_t buf_size; int ret = NOTIFY_OK; + bool resume = false; if (!kexec_in_progress) { pr_info("%s: No kexec in progress.\n", __func__); @@ -195,12 +196,15 @@ static int ima_update_kexec_buffer(struct notifier_block *self, return ret; } + ima_measurements_suspend(); + ret = ima_dump_measurement_list(&buf_size, &buf, kexec_segment_size); if (!buf) { pr_err("%s: Dump measurements failed. Error:%d\n", __func__, ret); + resume = true; goto out; } memcpy(ima_kexec_buffer, buf, buf_size); @@ -208,6 +212,9 @@ static int ima_update_kexec_buffer(struct notifier_block *self, kimage_unmap_segment(ima_kexec_buffer); ima_kexec_buffer = NULL; + if (resume) + ima_measurements_resume(); + return ret; } diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c index 532da87ce519..5946a26a2849 100644 --- a/security/integrity/ima/ima_queue.c +++ b/security/integrity/ima/ima_queue.c @@ -44,6 +44,11 @@ struct ima_h_table ima_htable = { */ static DEFINE_MUTEX(ima_extend_list_mutex); +/* + * Used internally by the kernel to suspend-resume ima measurements. + */ +static atomic_t suspend_ima_measurements; + /* lookup up the digest value in the hash table, and return the entry */ static struct ima_queue_entry *ima_lookup_digest_entry(u8 *digest_value, int pcr) @@ -148,6 +153,20 @@ static int ima_pcr_extend(struct tpm_digest *digests_arg, int pcr) return result; } +void ima_measurements_suspend(void) +{ + mutex_lock(&ima_extend_list_mutex); + atomic_set(&suspend_ima_measurements, 1); + mutex_unlock(&ima_extend_list_mutex); +} + +void ima_measurements_resume(void) +{ + mutex_lock(&ima_extend_list_mutex); + atomic_set(&suspend_ima_measurements, 0); + mutex_unlock(&ima_extend_list_mutex); +} + /* * Add template entry to the measurement list and hash table, and * extend the pcr. @@ -176,6 +195,19 @@ int ima_add_template_entry(struct ima_template_entry *entry, int violation, } } + /* + * suspend_ima_measurements will be set if the system is + * undergoing kexec soft boot to a new kernel. + * suspending measurements in this short window ensures the + * consistency of the IMA measurement list during copying + * of the kexec buffer. + */ + if (atomic_read(&suspend_ima_measurements)) { + audit_cause = "measurements_suspended"; + audit_info = 0; + goto out; + } + result = ima_add_digest_entry(entry, !IS_ENABLED(CONFIG_IMA_DISABLE_HTABLE)); if (result < 0) {