Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ima: kexec: skip IMA segment validation after kexec soft reboot

Currently, the function kexec_calculate_store_digests() calculates and
stores the digest of the segment during the kexec_file_load syscall,
where the IMA segment is also allocated.

Later, the IMA segment will be updated with the measurement log at the
kexec execute stage when a kexec reboot is initiated. Therefore, the
digests should be updated for the IMA segment in the normal case. The
problem is that the content of memory segments carried over to the new
kernel during the kexec systemcall can be changed at kexec 'execute'
stage, but the size and the location of the memory segments cannot be
changed at kexec 'execute' stage.

To address this, skip the calculation and storage of the digest for the
IMA segment in kexec_calculate_store_digests() so that it is not added
to the purgatory_sha_regions.

With this change, the IMA segment is not included in the digest
calculation, storage, and verification.

Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Dave Young <dyoung@redhat.com>
Co-developed-by: Tushar Sugandhi <tusharsu@linux.microsoft.com>
Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com>
Signed-off-by: Steven Chen <chenste@linux.microsoft.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Baoquan He <bhe@redhat.com>
Tested-by: Stefan Berger <stefanb@linux.ibm.com> # ppc64/kvm
[zohar@linux.ibm.com: Fixed Signed-off-by tag to match author's email ]
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>

authored by

Steven Chen and committed by
Mimi Zohar
9ee8888a 0091d924

+28
+3
include/linux/kexec.h
··· 369 369 370 370 phys_addr_t ima_buffer_addr; 371 371 size_t ima_buffer_size; 372 + 373 + unsigned long ima_segment_index; 374 + bool is_ima_segment_index_set; 372 375 #endif 373 376 374 377 /* Core ELF header buffer */
+22
kernel/kexec_file.c
··· 38 38 } 39 39 #endif 40 40 41 + #ifdef CONFIG_IMA_KEXEC 42 + static bool check_ima_segment_index(struct kimage *image, int i) 43 + { 44 + if (image->is_ima_segment_index_set && i == image->ima_segment_index) 45 + return true; 46 + else 47 + return false; 48 + } 49 + #else 50 + static bool check_ima_segment_index(struct kimage *image, int i) 51 + { 52 + return false; 53 + } 54 + #endif 55 + 41 56 static int kexec_calculate_store_digests(struct kimage *image); 42 57 43 58 /* Maximum size in bytes for kernel/initrd files. */ ··· 789 774 * info in purgatory. 790 775 */ 791 776 if (ksegment->kbuf == pi->purgatory_buf) 777 + continue; 778 + 779 + /* 780 + * Skip the segment if ima_segment_index is set and matches 781 + * the current index 782 + */ 783 + if (check_ima_segment_index(image, i)) 792 784 continue; 793 785 794 786 ret = crypto_shash_update(desc, ksegment->kbuf,
+3
security/integrity/ima/ima_kexec.c
··· 145 145 kbuf.buffer = kexec_buffer; 146 146 kbuf.bufsz = kexec_buffer_size; 147 147 kbuf.memsz = kexec_segment_size; 148 + image->is_ima_segment_index_set = false; 148 149 ret = kexec_add_buffer(&kbuf); 149 150 if (ret) { 150 151 pr_err("Error passing over kexec measurement buffer.\n"); ··· 156 155 image->ima_buffer_addr = kbuf.mem; 157 156 image->ima_buffer_size = kexec_segment_size; 158 157 image->ima_buffer = kexec_buffer; 158 + image->ima_segment_index = image->nr_segments - 1; 159 + image->is_ima_segment_index_set = true; 159 160 160 161 kexec_dprintk("kexec measurement buffer for the loaded kernel at 0x%lx.\n", 161 162 kbuf.mem);