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 03/10] ima: allocate buffer at kexec load to hold ima measurements Date: Mon, 3 Jul 2023 14:57:02 -0700 [thread overview] Message-ID: <20230703215709.1195644-4-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> The IMA subsystem needs a dedicated mechanism to reserve extra memory for measurements added between the kexec 'load' and kexec 'execute'. Update ima_add_kexec_buffer to allocate a buffer of a sufficient size taking ima binary runtime measurements size, size of ima_kexec_hdr, and IMA_KEXEC_EXTRA_SIZE into account. Adjust the kexec_segment_size to align to the PAGE_SIZE. Call ima_allocate_buf_at_kexec_load() to allocate the buffer. This patch assumes the extra space defined (IMA_KEXEC_EXTRA_SIZE) is sufficient to handle the additional measurements. This should be as per the system requirements and based on the number of additional measurements expected during the window from kexec 'load' to kexec 'execute'. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- security/integrity/ima/ima.h | 2 ++ security/integrity/ima/ima_kexec.c | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c29db699c996..2ffda9449b9b 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -43,6 +43,8 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8, TPM_PCR10 = 10 }; #define NR_BANKS(chip) ((chip != NULL) ? chip->nr_allocated_banks : 0) +#define IMA_KEXEC_EXTRA_SIZE (16 * PAGE_SIZE) + /* current content of the policy */ extern int ima_policy_flag; diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 858b67689701..7deb8df31485 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -188,31 +188,30 @@ void ima_add_kexec_buffer(struct kimage *image) /* use more understandable variable names than defined in kbuf */ void *kexec_buffer = NULL; size_t kexec_buffer_size; - size_t kexec_segment_size; int ret; /* - * Reserve an extra half page of memory for additional measurements - * added during the kexec load. + * Reserve extra memory for measurements added in the window from + * kexec 'load' to kexec 'execute'. */ - binary_runtime_size = ima_get_binary_runtime_size(); + binary_runtime_size = ima_get_binary_runtime_size() + + sizeof(struct ima_kexec_hdr) + + IMA_KEXEC_EXTRA_SIZE; + if (binary_runtime_size >= ULONG_MAX - PAGE_SIZE) kexec_segment_size = ULONG_MAX; else - kexec_segment_size = ALIGN(ima_get_binary_runtime_size() + - PAGE_SIZE / 2, PAGE_SIZE); + kexec_segment_size = ALIGN(binary_runtime_size, PAGE_SIZE); + if ((kexec_segment_size == ULONG_MAX) || ((kexec_segment_size >> PAGE_SHIFT) > totalram_pages() / 2)) { pr_err("Binary measurement list too large.\n"); return; } - ima_dump_measurement_list(&kexec_buffer_size, &kexec_buffer, - kexec_segment_size); - if (!kexec_buffer) { - pr_err("Not enough memory for the kexec measurement buffer.\n"); + ret = ima_allocate_buf_at_kexec_load(); + if (ret < 0) return; - } kbuf.buffer = kexec_buffer; kbuf.bufsz = kexec_buffer_size; -- 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 03/10] ima: allocate buffer at kexec load to hold ima measurements Date: Mon, 3 Jul 2023 14:57:02 -0700 [thread overview] Message-ID: <20230703215709.1195644-4-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> The IMA subsystem needs a dedicated mechanism to reserve extra memory for measurements added between the kexec 'load' and kexec 'execute'. Update ima_add_kexec_buffer to allocate a buffer of a sufficient size taking ima binary runtime measurements size, size of ima_kexec_hdr, and IMA_KEXEC_EXTRA_SIZE into account. Adjust the kexec_segment_size to align to the PAGE_SIZE. Call ima_allocate_buf_at_kexec_load() to allocate the buffer. This patch assumes the extra space defined (IMA_KEXEC_EXTRA_SIZE) is sufficient to handle the additional measurements. This should be as per the system requirements and based on the number of additional measurements expected during the window from kexec 'load' to kexec 'execute'. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- security/integrity/ima/ima.h | 2 ++ security/integrity/ima/ima_kexec.c | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c29db699c996..2ffda9449b9b 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -43,6 +43,8 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8, TPM_PCR10 = 10 }; #define NR_BANKS(chip) ((chip != NULL) ? chip->nr_allocated_banks : 0) +#define IMA_KEXEC_EXTRA_SIZE (16 * PAGE_SIZE) + /* current content of the policy */ extern int ima_policy_flag; diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 858b67689701..7deb8df31485 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -188,31 +188,30 @@ void ima_add_kexec_buffer(struct kimage *image) /* use more understandable variable names than defined in kbuf */ void *kexec_buffer = NULL; size_t kexec_buffer_size; - size_t kexec_segment_size; int ret; /* - * Reserve an extra half page of memory for additional measurements - * added during the kexec load. + * Reserve extra memory for measurements added in the window from + * kexec 'load' to kexec 'execute'. */ - binary_runtime_size = ima_get_binary_runtime_size(); + binary_runtime_size = ima_get_binary_runtime_size() + + sizeof(struct ima_kexec_hdr) + + IMA_KEXEC_EXTRA_SIZE; + if (binary_runtime_size >= ULONG_MAX - PAGE_SIZE) kexec_segment_size = ULONG_MAX; else - kexec_segment_size = ALIGN(ima_get_binary_runtime_size() + - PAGE_SIZE / 2, PAGE_SIZE); + kexec_segment_size = ALIGN(binary_runtime_size, PAGE_SIZE); + if ((kexec_segment_size == ULONG_MAX) || ((kexec_segment_size >> PAGE_SHIFT) > totalram_pages() / 2)) { pr_err("Binary measurement list too large.\n"); return; } - ima_dump_measurement_list(&kexec_buffer_size, &kexec_buffer, - kexec_segment_size); - if (!kexec_buffer) { - pr_err("Not enough memory for the kexec measurement buffer.\n"); + ret = ima_allocate_buf_at_kexec_load(); + if (ret < 0) return; - } kbuf.buffer = kexec_buffer; kbuf.bufsz = kexec_buffer_size; -- 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 ` Tushar Sugandhi [this message] 2023-07-03 21:57 ` [PATCH 03/10] ima: allocate buffer at kexec load to hold ima measurements 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 ` [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-4-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.