kexec:i386/kexec-[bzImage|elf-x86]:x86_64/kexec-bzImage64:
Subsystems (2)
PATCH 1/1 kexec:i386/kexec-[bzImage|elf-x86]:x86_64/kexec-bzImage64:
This patch prevents the problems to happen below:
In setup_linux_bootloader_parameters_high
120 cmdline_ptr = ((char *)real_mode) + cmdline_offset; 121 memcpy(cmdline_ptr, cmdline, cmdline_len); 122 cmdline_ptr[cmdline_len - 1] = '\0';
if cmdline_len == 0, Line 122 will corrupt kernel16 buf just before the commandline. And in do_bzImage_load, for example,
369 cmdline_end = setup_base + kern16_size_needed + command_line_len - 1;
370 elf_rel_set_symbol(&info->rhdr, "cmdline_end", &cmdline_end,
371 sizeof(unsigned long));
Line 369 will go wrong, too.
Signed-off-by Wang YanQing <[email protected]>
---
Hi Zhang Yanfei, could you give your signed-off-by to this patch?
kexec/arch/i386/kexec-bzImage.c | 3 +++ kexec/arch/i386/kexec-elf-x86.c | 3 +++ kexec/arch/x86_64/kexec-bzImage64.c | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-)
kexec/arch/i386/kexec-bzImage.c +3 -0
@@ -435,6 +435,9 @@ int bzImage_load(int argc, char **argv, const char *buf, off_t len, command_line_len =0 ;if (command_line) { command_line_len =strlen (command_line) +1 ; + }else { + command_line =strdup ("\0" ); + command_line_len =1 ; } ramdisk_buf =0 ;if (ramdisk) {
kexec/arch/i386/kexec-elf-x86.c +3 -0
@@ -161,6 +161,9 @@ int elf_x86_load(int argc, char **argv, const char *buf, off_t len, command_line_len =0 ;if (command_line) { command_line_len =strlen (command_line) +1 ; + }else { + command_line =strdup ("\0" ); + command_line_len =1 ; }/* Need to append some command line parameters internally in case of
kexec/arch/x86_64/kexec-bzImage64.c +5 -1
@@ -284,8 +284,12 @@ int bzImage64_load(int argc, char **argv, const char *buf, off_t len, } command_line =concat_cmdline (command_line, append); command_line_len =0 ; -if (command_line) +if (command_line) { command_line_len =strlen (command_line) +1 ; + }else { + command_line =strdup ("\0" ); + command_line_len =1 ; + } ramdisk_buf =0 ;if (ramdisk) ramdisk_buf =slurp_file (ramdisk, &ramdisk_length);
Signature · 6 lines
1.7.12.4.dirty _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec