From: Tushar Sugandhi <tusharsu@linux.microsoft.com> To: zohar@linux.ibm.com, noodles@fb.com, bauermann@kolabnow.com, kexec@lists.infradead.org, linux-integrity@vger.kernel.org Cc: code@tyhicks.com, nramas@linux.microsoft.com, paul@paul-moore.com Subject: [PATCH 09/10] ima: suspend measurements while the kexec buffer is being copied Date: Mon, 3 Jul 2023 14:57:08 -0700 [thread overview] Message-ID: <20230703215709.1195644-10-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> If the new measurements are added to the list while the kexec buffer is being copied during kexec execute, the buffer may get corrupted, or it can go out of sync with TPM PCRs. This could potentially lead to breaking the integrity of the measurements after the kexec soft reboot to the new kernel. Introduce a check in the ima_add_template_entry function not to measure events and return from the function early when the suspend_ima_measurements flag is set. This ensures the consistency of the IMA measurement list during the copying of the kexec buffer. When the suspend_ima_measurements flag is set, any new measurements will be ignored until the flag is unset. This allows the buffer to be safely copied without worrying about concurrent modifications to the measurement list. This is crucial for maintaining the integrity of the measurements during a kexec soft reboot. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- security/integrity/ima/ima_queue.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c index cb9abc02a304..5946a26a2849 100644 --- a/security/integrity/ima/ima_queue.c +++ b/security/integrity/ima/ima_queue.c @@ -195,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) { -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Tushar Sugandhi <tusharsu@linux.microsoft.com> To: zohar@linux.ibm.com, noodles@fb.com, bauermann@kolabnow.com, kexec@lists.infradead.org, linux-integrity@vger.kernel.org Cc: code@tyhicks.com, nramas@linux.microsoft.com, paul@paul-moore.com Subject: [PATCH 09/10] ima: suspend measurements while the kexec buffer is being copied Date: Mon, 3 Jul 2023 14:57:08 -0700 [thread overview] Message-ID: <20230703215709.1195644-10-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> If the new measurements are added to the list while the kexec buffer is being copied during kexec execute, the buffer may get corrupted, or it can go out of sync with TPM PCRs. This could potentially lead to breaking the integrity of the measurements after the kexec soft reboot to the new kernel. Introduce a check in the ima_add_template_entry function not to measure events and return from the function early when the suspend_ima_measurements flag is set. This ensures the consistency of the IMA measurement list during the copying of the kexec buffer. When the suspend_ima_measurements flag is set, any new measurements will be ignored until the flag is unset. This allows the buffer to be safely copied without worrying about concurrent modifications to the measurement list. This is crucial for maintaining the integrity of the measurements during a kexec soft reboot. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- security/integrity/ima/ima_queue.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c index cb9abc02a304..5946a26a2849 100644 --- a/security/integrity/ima/ima_queue.c +++ b/security/integrity/ima/ima_queue.c @@ -195,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) { -- 2.25.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2023-07-03 21:57 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-03 21:56 [PATCH 00/10] ima: measure events between kexec load and execute Tushar Sugandhi 2023-07-03 21:56 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 01/10] ima: implement function to allocate buffer at kexec load Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-07 13:00 ` Mimi Zohar 2023-07-07 13:00 ` Mimi Zohar 2023-07-11 17:59 ` Tushar Sugandhi 2023-07-11 17:59 ` Tushar Sugandhi 2023-07-11 21:11 ` Mimi Zohar 2023-07-11 21:11 ` Mimi Zohar 2023-07-12 19:49 ` Tushar Sugandhi 2023-07-12 19:49 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 02/10] ima: implement function to populate buffer at kexec execute Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-07 13:00 ` Mimi Zohar 2023-07-07 13:00 ` Mimi Zohar 2023-07-11 18:05 ` Tushar Sugandhi 2023-07-11 18:05 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 03/10] ima: allocate buffer at kexec load to hold ima measurements Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-07 13:01 ` Mimi Zohar 2023-07-07 13:01 ` Mimi Zohar 2023-07-11 18:31 ` Tushar Sugandhi 2023-07-11 18:31 ` Tushar Sugandhi 2023-07-11 20:16 ` Stefan Berger 2023-07-11 20:16 ` Stefan Berger 2023-07-12 19:39 ` Tushar Sugandhi 2023-07-12 19:39 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 04/10] ima: implement functions to suspend and resume measurements Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 05/10] kexec: implement functions to map and unmap segment to kimage Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-07 12:28 ` Stefan Berger 2023-07-07 12:28 ` Stefan Berger 2023-07-11 18:41 ` Tushar Sugandhi 2023-07-11 18:41 ` Tushar Sugandhi 2023-07-11 19:19 ` Stefan Berger 2023-07-11 19:19 ` Stefan Berger 2023-07-12 19:51 ` Tushar Sugandhi 2023-07-12 19:51 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 06/10] ima: update buffer at kexec execute with ima measurements Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-07 15:01 ` Mimi Zohar 2023-07-07 15:01 ` Mimi Zohar 2023-07-07 19:49 ` Mimi Zohar 2023-07-07 19:49 ` Mimi Zohar 2023-07-11 19:08 ` Tushar Sugandhi 2023-07-11 19:08 ` Tushar Sugandhi 2023-07-12 15:45 ` Mimi Zohar 2023-07-12 15:45 ` Mimi Zohar 2023-07-11 19:05 ` Tushar Sugandhi 2023-07-11 19:05 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 07/10] ima: remove function ima_dump_measurement_list Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-07 13:55 ` Mimi Zohar 2023-07-07 13:55 ` Mimi Zohar 2023-07-11 19:11 ` Tushar Sugandhi 2023-07-11 19:11 ` Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 08/10] ima: implement and register a reboot notifier function to update kexec buffer Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi [this message] 2023-07-03 21:57 ` [PATCH 09/10] ima: suspend measurements while the kexec buffer is being copied Tushar Sugandhi 2023-07-03 21:57 ` [PATCH 10/10] kexec: update kexec_file_load syscall to call ima_kexec_post_load Tushar Sugandhi 2023-07-03 21:57 ` Tushar Sugandhi 2023-07-07 8:20 ` RuiRui Yang 2023-07-07 8:20 ` RuiRui Yang 2023-07-11 19:14 ` Tushar Sugandhi 2023-07-11 19:14 ` Tushar Sugandhi 2023-07-12 1:28 ` RuiRui Yang 2023-07-12 1:28 ` RuiRui Yang 2023-07-12 19:30 ` Tushar Sugandhi 2023-07-12 19:30 ` Tushar Sugandhi 2023-07-07 8:18 ` [PATCH 00/10] ima: measure events between kexec load and execute Dave Young 2023-07-07 8:18 ` Dave Young 2023-07-11 17:52 ` Tushar Sugandhi 2023-07-11 17:52 ` Tushar Sugandhi 2023-07-07 15:55 ` Mimi Zohar 2023-07-07 15:55 ` Mimi Zohar 2023-07-11 17:51 ` Tushar Sugandhi 2023-07-11 17:51 ` Tushar Sugandhi 2023-09-22 18:59 ` Tushar Sugandhi 2023-09-22 18:59 ` Tushar Sugandhi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230703215709.1195644-10-tusharsu@linux.microsoft.com \ --to=tusharsu@linux.microsoft.com \ --cc=bauermann@kolabnow.com \ --cc=code@tyhicks.com \ --cc=kexec@lists.infradead.org \ --cc=linux-integrity@vger.kernel.org \ --cc=noodles@fb.com \ --cc=nramas@linux.microsoft.com \ --cc=paul@paul-moore.com \ --cc=zohar@linux.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.