kernel/kexec: change the prototype of kimage_map_segment()

The kexec segment index will be required to extract the corresponding
information for that segment in kimage_map_segment().  Additionally,
kexec_segment already holds the kexec relocation destination address and
size.  Therefore, the prototype of kimage_map_segment() can be changed.

Link: https://lkml.kernel.org/r/20251216014852.8737-1-piliu@redhat.com
Fixes: 07d24902977e ("kexec: enable CMA based contiguous allocation")
Signed-off-by: Pingfan Liu <piliu@redhat.com>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Mimi Zohar <zohar@linux.ibm.com>
Cc: Roberto Sassu <roberto.sassu@huawei.com>
Cc: Alexander Graf <graf@amazon.com>
Cc: Steven Chen <chenste@linux.microsoft.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index ff7e231b0485a98b4064639ef0d481f1e7e277b3..8a22bc9b8c6c85c2a821344cadf5b9fb766b3b4c 100644 (file)
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -530,7 +530,7 @@ extern bool kexec_file_dbg_print;
 #define kexec_dprintk(fmt, arg...) \
         do { if (kexec_file_dbg_print) pr_info(fmt, ##arg); } while (0)
 
-extern void *kimage_map_segment(struct kimage *image, unsigned long addr, unsigned long size);
+extern void *kimage_map_segment(struct kimage *image, int idx);
 extern void kimage_unmap_segment(void *buffer);
 #else /* !CONFIG_KEXEC_CORE */
 struct pt_regs;
@@ -540,7 +540,7 @@ static inline void __crash_kexec(struct pt_regs *regs) { }
 static inline void crash_kexec(struct pt_regs *regs) { }
 static inline int kexec_should_crash(struct task_struct *p) { return 0; }
 static inline int kexec_crash_loaded(void) { return 0; }
-static inline void *kimage_map_segment(struct kimage *image, unsigned long addr, unsigned long size)
+static inline void *kimage_map_segment(struct kimage *image, int idx)
 { return NULL; }
 static inline void kimage_unmap_segment(void *buffer) { }
 #define kexec_in_progress false

diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 0f92acdd354da8dcc63ee28b84ce24b63a49923c..1a79c5b18d8fd3f7e6ea7bf0a02cf6b26f57c748 100644 (file)
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -953,17 +953,20 @@ int kimage_load_segment(struct kimage *image, int idx)
        return result;
 }
 
-void *kimage_map_segment(struct kimage *image,
-                        unsigned long addr, unsigned long size)
+void *kimage_map_segment(struct kimage *image, int idx)
 {
+       unsigned long addr, size, eaddr;
        unsigned long src_page_addr, dest_page_addr = 0;
-       unsigned long eaddr = addr + size;
        kimage_entry_t *ptr, entry;
        struct page **src_pages;
        unsigned int npages;
        void *vaddr = NULL;
        int i;
 
+       addr = image->segment[idx].mem;
+       size = image->segment[idx].memsz;
+       eaddr = addr + size;
+
        /*
         * Collect the source pages and map them in a contiguous VA range.
         */

diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c
index 7362f68f2d8b17dadf103130acf437358c59ad9e..5beb69edd12fd2da99301e6f10458b8ee0d8c55a 100644 (file)
--- a/security/integrity/ima/ima_kexec.c
+++ b/security/integrity/ima/ima_kexec.c
@@ -250,9 +250,7 @@ void ima_kexec_post_load(struct kimage *image)
        if (!image->ima_buffer_addr)
                return;
 
-       ima_kexec_buffer = kimage_map_segment(image,
-                                             image->ima_buffer_addr,
-                                             image->ima_buffer_size);
+       ima_kexec_buffer = kimage_map_segment(image, image->ima_segment_index);
        if (!ima_kexec_buffer) {
                pr_err("Could not map measurements buffer.\n");
                return;