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 07/10] ima: remove function ima_dump_measurement_list Date: Mon, 3 Jul 2023 14:57:06 -0700 [thread overview] Message-ID: <20230703215709.1195644-8-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> The ima_dump_measurement_list function was designed to iterate over the IMA measurement list and store each entry into a buffer. The buffer, along with its size, would be returned to the caller. However, the function is no longer required in the IMA subsystem. It previously served to dump the measurement list during the kexec 'load' operation, but this functionality has been replaced by an alternative approach in this patch series. Remove the unused ima_dump_measurement_list function from the IMA subsystem, to ensure a cleaner and more maintainable code. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- security/integrity/ima/ima_kexec.c | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 224d88ccfe85..424930085c18 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -115,64 +115,6 @@ static int ima_populate_buf_at_kexec_execute(unsigned long *buffer_size, void ** } -static int ima_dump_measurement_list(unsigned long *buffer_size, void **buffer, - unsigned long segment_size) -{ - struct ima_queue_entry *qe; - struct seq_file file; - struct ima_kexec_hdr khdr; - int ret = 0; - - /* segment size can't change between kexec load and execute */ - file.buf = vmalloc(segment_size); - if (!file.buf) { - ret = -ENOMEM; - goto out; - } - - file.size = segment_size; - file.read_pos = 0; - file.count = sizeof(khdr); /* reserved space */ - - memset(&khdr, 0, sizeof(khdr)); - khdr.version = 1; - list_for_each_entry_rcu(qe, &ima_measurements, later) { - if (file.count < file.size) { - khdr.count++; - ima_measurements_show(&file, qe); - } else { - ret = -EINVAL; - break; - } - } - - if (ret < 0) - goto out; - - /* - * fill in reserved space with some buffer details - * (eg. version, buffer size, number of measurements) - */ - khdr.buffer_size = file.count; - if (ima_canonical_fmt) { - khdr.version = cpu_to_le16(khdr.version); - khdr.count = cpu_to_le64(khdr.count); - khdr.buffer_size = cpu_to_le64(khdr.buffer_size); - } - memcpy(file.buf, &khdr, sizeof(khdr)); - - print_hex_dump_debug("ima dump: ", DUMP_PREFIX_NONE, 16, 1, - file.buf, file.count < 100 ? file.count : 100, - true); - - *buffer_size = file.count; - *buffer = file.buf; -out: - if (ret == -EINVAL) - vfree(file.buf); - return ret; -} - /* * Called during kexec_file_load so that IMA can add a segment to the kexec * image for the measurement list for the next kernel. -- 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 07/10] ima: remove function ima_dump_measurement_list Date: Mon, 3 Jul 2023 14:57:06 -0700 [thread overview] Message-ID: <20230703215709.1195644-8-tusharsu@linux.microsoft.com> (raw) In-Reply-To: <20230703215709.1195644-1-tusharsu@linux.microsoft.com> The ima_dump_measurement_list function was designed to iterate over the IMA measurement list and store each entry into a buffer. The buffer, along with its size, would be returned to the caller. However, the function is no longer required in the IMA subsystem. It previously served to dump the measurement list during the kexec 'load' operation, but this functionality has been replaced by an alternative approach in this patch series. Remove the unused ima_dump_measurement_list function from the IMA subsystem, to ensure a cleaner and more maintainable code. Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com> --- security/integrity/ima/ima_kexec.c | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 224d88ccfe85..424930085c18 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -115,64 +115,6 @@ static int ima_populate_buf_at_kexec_execute(unsigned long *buffer_size, void ** } -static int ima_dump_measurement_list(unsigned long *buffer_size, void **buffer, - unsigned long segment_size) -{ - struct ima_queue_entry *qe; - struct seq_file file; - struct ima_kexec_hdr khdr; - int ret = 0; - - /* segment size can't change between kexec load and execute */ - file.buf = vmalloc(segment_size); - if (!file.buf) { - ret = -ENOMEM; - goto out; - } - - file.size = segment_size; - file.read_pos = 0; - file.count = sizeof(khdr); /* reserved space */ - - memset(&khdr, 0, sizeof(khdr)); - khdr.version = 1; - list_for_each_entry_rcu(qe, &ima_measurements, later) { - if (file.count < file.size) { - khdr.count++; - ima_measurements_show(&file, qe); - } else { - ret = -EINVAL; - break; - } - } - - if (ret < 0) - goto out; - - /* - * fill in reserved space with some buffer details - * (eg. version, buffer size, number of measurements) - */ - khdr.buffer_size = file.count; - if (ima_canonical_fmt) { - khdr.version = cpu_to_le16(khdr.version); - khdr.count = cpu_to_le64(khdr.count); - khdr.buffer_size = cpu_to_le64(khdr.buffer_size); - } - memcpy(file.buf, &khdr, sizeof(khdr)); - - print_hex_dump_debug("ima dump: ", DUMP_PREFIX_NONE, 16, 1, - file.buf, file.count < 100 ? file.count : 100, - true); - - *buffer_size = file.count; - *buffer = file.buf; -out: - if (ret == -EINVAL) - vfree(file.buf); - return ret; -} - /* * Called during kexec_file_load so that IMA can add a segment to the kexec * image for the measurement list for the next kernel. -- 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 ` Tushar Sugandhi [this message] 2023-07-03 21:57 ` [PATCH 07/10] ima: remove function ima_dump_measurement_list 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-8-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.