Skip to content

Commit a3785ae

Browse files
Pingfan Liuakpm00
authored andcommitted
kernel/kexec: fix IMA when allocation happens in CMA area
*** Bug description *** When I tested kexec with the latest kernel, I ran into the following warning: [ 40.712410] ------------[ cut here ]------------ [ 40.712576] WARNING: CPU: 2 PID: 1562 at kernel/kexec_core.c:1001 kimage_map_segment+0x144/0x198 [...] [ 40.816047] Call trace: [ 40.818498] kimage_map_segment+0x144/0x198 (P) [ 40.823221] ima_kexec_post_load+0x58/0xc0 [ 40.827246] __do_sys_kexec_file_load+0x29c/0x368 [...] [ 40.855423] ---[ end trace 0000000000000000 ]--- *** How to reproduce *** This bug is only triggered when the kexec target address is allocated in the CMA area. If no CMA area is reserved in the kernel, use the "cma=" option in the kernel command line to reserve one. *** Root cause *** The commit 07d2490 ("kexec: enable CMA based contiguous allocation") allocates the kexec target address directly on the CMA area to avoid copying during the jump. In this case, there is no IND_SOURCE for the kexec segment. But the current implementation of kimage_map_segment() assumes that IND_SOURCE pages exist and map them into a contiguous virtual address by vmap(). *** Solution *** If IMA segment is allocated in the CMA area, use its page_address() directly. Link: https://lkml.kernel.org/r/20251216014852.8737-2-piliu@redhat.com Fixes: 07d2490 ("kexec: enable CMA based contiguous allocation") Signed-off-by: Pingfan Liu <piliu@redhat.com> Acked-by: Baoquan He <bhe@redhat.com> Cc: Alexander Graf <graf@amazon.com> Cc: Steven Chen <chenste@linux.microsoft.com> Cc: Mimi Zohar <zohar@linux.ibm.com> Cc: Roberto Sassu <roberto.sassu@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent fe55ea8 commit a3785ae

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

kernel/kexec_core.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -960,13 +960,17 @@ void *kimage_map_segment(struct kimage *image, int idx)
960960
kimage_entry_t *ptr, entry;
961961
struct page **src_pages;
962962
unsigned int npages;
963+
struct page *cma;
963964
void *vaddr = NULL;
964965
int i;
965966

967+
cma = image->segment_cma[idx];
968+
if (cma)
969+
return page_address(cma);
970+
966971
addr = image->segment[idx].mem;
967972
size = image->segment[idx].memsz;
968973
eaddr = addr + size;
969-
970974
/*
971975
* Collect the source pages and map them in a contiguous VA range.
972976
*/
@@ -1007,7 +1011,8 @@ void *kimage_map_segment(struct kimage *image, int idx)
10071011

10081012
void kimage_unmap_segment(void *segment_buffer)
10091013
{
1010-
vunmap(segment_buffer);
1014+
if (is_vmalloc_addr(segment_buffer))
1015+
vunmap(segment_buffer);
10111016
}
10121017

10131018
struct kexec_load_limit {

0 commit comments

Comments
 (0)