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 08/10] ima: implement and register a reboot notifier function to update kexec buffer Date: Mon, 3 Jul 2023 14:57:07 -0700 [thread overview] Message-ID: <20230703215709.1195644-9-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> The IMA subsystem needs to ensure that the measurement list is up to date during a kexec operation, i.e., when the kernel is rebooted without going through the full system reboot process. Currently, there is no mechanism to update the measurement list when the system is soft booted using kexec. Add a notifier function ima_update_kexec_buffer that is called during a kexec soft reboot. Implement ima_kexec_post_load, which maps the IMA buffer after a kexec load and registers the reboot notifier. Define a new notifier block update_buffer_nb, with ima_update_kexec_buffer as its notifier function. Register the notifier function in ima_kexec_post_load if it hasn't been already, indicated by the ima_kexec_update_registered flag. When a kexec soft reboot is triggered, ima_update_kexec_buffer will be executed to update the IMA buffer. This ensures that the events between kexec 'load' and 'execute' are captured and integrity of measurements remains intact across kexec reboots. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- include/linux/ima.h | 3 +++ security/integrity/ima/ima_kexec.c | 35 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/linux/ima.h b/include/linux/ima.h index 86b57757c7b1..006db20f852d 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -49,6 +49,9 @@ static inline void ima_appraise_parse_cmdline(void) {} #ifdef CONFIG_IMA_KEXEC extern void ima_add_kexec_buffer(struct kimage *image); +extern void ima_kexec_post_load(struct kimage *image); +#else +static inline void ima_kexec_post_load(struct kimage *image) {} #endif #else diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 424930085c18..363c107dc4a5 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -12,6 +12,8 @@ #include <linux/kexec.h> #include <linux/of.h> #include <linux/ima.h> +#include <linux/reboot.h> +#include <asm/page.h> #include "ima.h" #ifdef CONFIG_IMA_KEXEC @@ -19,6 +21,7 @@ struct seq_file ima_kexec_file; struct ima_kexec_hdr ima_khdr; static size_t kexec_segment_size; static void *ima_kexec_buffer; +static bool ima_kexec_update_registered; void ima_clear_kexec_file(void) { @@ -222,6 +225,38 @@ static int ima_update_kexec_buffer(struct notifier_block *self, return NOTIFY_OK; } +struct notifier_block update_buffer_nb = { + .notifier_call = ima_update_kexec_buffer, +}; + +/* + * Create a mapping for the source pages that contain the IMA buffer + * so we can update it later. + */ +void ima_kexec_post_load(struct kimage *image) +{ + if (ima_kexec_buffer) { + kimage_unmap_segment(ima_kexec_buffer); + ima_kexec_buffer = NULL; + } + + if (!image->ima_buffer_addr) + return; + + ima_kexec_buffer = kimage_map_segment(image, + image->ima_buffer_addr, + image->ima_buffer_size); + if (!ima_kexec_buffer) { + pr_err("%s: Could not map measurements buffer.\n", __func__); + return; + } + + if (!ima_kexec_update_registered) { + register_reboot_notifier(&update_buffer_nb); + ima_kexec_update_registered = true; + } +} + #endif /* IMA_KEXEC */ /* -- 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 08/10] ima: implement and register a reboot notifier function to update kexec buffer Date: Mon, 3 Jul 2023 14:57:07 -0700 [thread overview] Message-ID: <20230703215709.1195644-9-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> The IMA subsystem needs to ensure that the measurement list is up to date during a kexec operation, i.e., when the kernel is rebooted without going through the full system reboot process. Currently, there is no mechanism to update the measurement list when the system is soft booted using kexec. Add a notifier function ima_update_kexec_buffer that is called during a kexec soft reboot. Implement ima_kexec_post_load, which maps the IMA buffer after a kexec load and registers the reboot notifier. Define a new notifier block update_buffer_nb, with ima_update_kexec_buffer as its notifier function. Register the notifier function in ima_kexec_post_load if it hasn't been already, indicated by the ima_kexec_update_registered flag. When a kexec soft reboot is triggered, ima_update_kexec_buffer will be executed to update the IMA buffer. This ensures that the events between kexec 'load' and 'execute' are captured and integrity of measurements remains intact across kexec reboots. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- include/linux/ima.h | 3 +++ security/integrity/ima/ima_kexec.c | 35 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/linux/ima.h b/include/linux/ima.h index 86b57757c7b1..006db20f852d 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -49,6 +49,9 @@ static inline void ima_appraise_parse_cmdline(void) {} #ifdef CONFIG_IMA_KEXEC extern void ima_add_kexec_buffer(struct kimage *image); +extern void ima_kexec_post_load(struct kimage *image); +#else +static inline void ima_kexec_post_load(struct kimage *image) {} #endif #else diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 424930085c18..363c107dc4a5 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -12,6 +12,8 @@ #include <linux/kexec.h> #include <linux/of.h> #include <linux/ima.h> +#include <linux/reboot.h> +#include <asm/page.h> #include "ima.h" #ifdef CONFIG_IMA_KEXEC @@ -19,6 +21,7 @@ struct seq_file ima_kexec_file; struct ima_kexec_hdr ima_khdr; static size_t kexec_segment_size; static void *ima_kexec_buffer; +static bool ima_kexec_update_registered; void ima_clear_kexec_file(void) { @@ -222,6 +225,38 @@ static int ima_update_kexec_buffer(struct notifier_block *self, return NOTIFY_OK; } +struct notifier_block update_buffer_nb = { + .notifier_call = ima_update_kexec_buffer, +}; + +/* + * Create a mapping for the source pages that contain the IMA buffer + * so we can update it later. + */ +void ima_kexec_post_load(struct kimage *image) +{ + if (ima_kexec_buffer) { + kimage_unmap_segment(ima_kexec_buffer); + ima_kexec_buffer = NULL; + } + + if (!image->ima_buffer_addr) + return; + + ima_kexec_buffer = kimage_map_segment(image, + image->ima_buffer_addr, + image->ima_buffer_size); + if (!ima_kexec_buffer) { + pr_err("%s: Could not map measurements buffer.\n", __func__); + return; + } + + if (!ima_kexec_update_registered) { + register_reboot_notifier(&update_buffer_nb); + ima_kexec_update_registered = true; + } +} + #endif /* IMA_KEXEC */ /* -- 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 ` Tushar Sugandhi [this message] 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 ` [PATCH 09/10] ima: suspend measurements while the kexec buffer is being copied Tushar Sugandhi 2023-07-03 21:57 ` 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-9-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.