[PATCH v2 3/5] multiboot2: Use rel_min and rel_max for buffer destinations
Zhaofeng Li
hello at zhaofeng.li
Mon Sep 13 20:51:40 PDT 2021
This would segfault if mhi.rel_tag didn't exist.
Signed-off-by: Zhaofeng Li <hello at zhaofeng.li>
---
kexec/arch/i386/kexec-mb2-x86.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kexec/arch/i386/kexec-mb2-x86.c b/kexec/arch/i386/kexec-mb2-x86.c
index 6bbe35e..f3c6438 100644
--- a/kexec/arch/i386/kexec-mb2-x86.c
+++ b/kexec/arch/i386/kexec-mb2-x86.c
@@ -582,7 +582,7 @@ int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
/* Pick the next aligned spot to load it in. Always page align. */
addr = add_buffer(info, buf, mod_size, mod_size, getpagesize(),
- mhi.rel_tag->min_addr, mhi.rel_tag->max_addr, 1);
+ rel_min, rel_max, 1);
/* Add the module command line */
sprintf(mod_clp, "%s", mod_command_line);
@@ -602,7 +602,7 @@ int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
return -1;
addr = add_buffer(info, mbi_buf, mbi_bytes, mbi_bytes, 4,
- mhi.rel_tag->min_addr, mhi.rel_tag->max_addr, 1);
+ rel_min, rel_max, 1);
elf_rel_get_symbol(&info->rhdr, "entry32_regs", ®s, sizeof(regs));
regs.eax = MULTIBOOT2_BOOTLOADER_MAGIC;
--
2.32.0
More information about the kexec
mailing list