Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-22 07:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/mkimage: Use grub_host_to_target32() instead of grub_cpu_to_le32()

Browse Source 
The latter doesn't take into account the target image endianness. There is
a grub_cpu_to_le32_compile_time() but no compile time variant for function
grub_host_to_target32(). So, let's keep using the other one for this case.

Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Peter Jones authored and Daniel Kiper committed 2021-03-02 15:54:19 +01:00
1 parent d52f78def1
commit 1710452aca
1 file changed
+22 -22
Download Patch File Download Diff File Expand all files Collapse all files
util/mkimage.c
+22 -22
View File
@@ -1302,10 +1302,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
+ sizeof (struct grub_pe32_coff_header)); + sizeof (struct grub_pe32_coff_header));
o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
o->code_size = grub_host_to_target32 (layout.exec_size); o->code_size = grub_host_to_target32 (layout.exec_size);
o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size
- header_size); - header_size);
o->entry_addr = grub_cpu_to_le32 (layout.start_address); o->entry_addr = grub_host_to_target32 (layout.start_address);
o->code_base = grub_cpu_to_le32 (header_size); o->code_base = grub_host_to_target32 (header_size);
o->data_base = grub_host_to_target32 (header_size + layout.exec_size); o->data_base = grub_host_to_target32 (header_size + layout.exec_size);
@@ -1339,10 +1339,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
+ sizeof (struct grub_pe32_coff_header)); + sizeof (struct grub_pe32_coff_header));
o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC);
o->code_size = grub_host_to_target32 (layout.exec_size); o->code_size = grub_host_to_target32 (layout.exec_size);
o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size
- header_size); - header_size);
o->entry_addr = grub_cpu_to_le32 (layout.start_address); o->entry_addr = grub_host_to_target32 (layout.start_address);
o->code_base = grub_cpu_to_le32 (header_size); o->code_base = grub_host_to_target32 (header_size);
o->image_base = 0; o->image_base = 0;
o->section_alignment = grub_host_to_target32 (image_target->section_align); o->section_alignment = grub_host_to_target32 (image_target->section_align);
o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT);
@@ -1366,10 +1366,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
/* The sections. */ /* The sections. */
text_section = sections; text_section = sections;
strcpy (text_section->name, ".text"); strcpy (text_section->name, ".text");
text_section->virtual_size = grub_cpu_to_le32 (layout.exec_size); text_section->virtual_size = grub_host_to_target32 (layout.exec_size);
text_section->virtual_address = grub_cpu_to_le32 (header_size); text_section->virtual_address = grub_host_to_target32 (header_size);
text_section->raw_data_size = grub_cpu_to_le32 (layout.exec_size); text_section->raw_data_size = grub_host_to_target32 (layout.exec_size);
text_section->raw_data_offset = grub_cpu_to_le32 (header_size); text_section->raw_data_offset = grub_host_to_target32 (header_size);
text_section->characteristics = grub_cpu_to_le32_compile_time ( text_section->characteristics = grub_cpu_to_le32_compile_time (
GRUB_PE32_SCN_CNT_CODE GRUB_PE32_SCN_CNT_CODE
| GRUB_PE32_SCN_MEM_EXECUTE | GRUB_PE32_SCN_MEM_EXECUTE
@@ -1377,10 +1377,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
data_section = text_section + 1; data_section = text_section + 1;
strcpy (data_section->name, ".data"); strcpy (data_section->name, ".data");
data_section->virtual_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size); data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size);
data_section->virtual_address = grub_cpu_to_le32 (header_size + layout.exec_size); data_section->virtual_address = grub_host_to_target32 (header_size + layout.exec_size);
data_section->raw_data_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size); data_section->raw_data_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size);
data_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.exec_size); data_section->raw_data_offset = grub_host_to_target32 (header_size + layout.exec_size);
data_section->characteristics data_section->characteristics
= grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
| GRUB_PE32_SCN_MEM_READ | GRUB_PE32_SCN_MEM_READ
@@ -1388,10 +1388,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
mods_section = data_section + 1; mods_section = data_section + 1;
strcpy (mods_section->name, "mods"); strcpy (mods_section->name, "mods");
mods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size); mods_section->virtual_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size);
mods_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size + layout.bss_size); mods_section->virtual_address = grub_host_to_target32 (header_size + layout.kernel_size + layout.bss_size);
mods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size); mods_section->raw_data_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size);
mods_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.kernel_size); mods_section->raw_data_offset = grub_host_to_target32 (header_size + layout.kernel_size);
mods_section->characteristics mods_section->characteristics
= grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
| GRUB_PE32_SCN_MEM_READ | GRUB_PE32_SCN_MEM_READ
@@ -1399,10 +1399,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
reloc_section = mods_section + 1; reloc_section = mods_section + 1;
strcpy (reloc_section->name, ".reloc"); strcpy (reloc_section->name, ".reloc");
reloc_section->virtual_size = grub_cpu_to_le32 (layout.reloc_size); reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size);
reloc_section->virtual_address = grub_cpu_to_le32 (reloc_addr + layout.bss_size); reloc_section->virtual_address = grub_host_to_target32 (reloc_addr + layout.bss_size);
reloc_section->raw_data_size = grub_cpu_to_le32 (layout.reloc_size); reloc_section->raw_data_size = grub_host_to_target32 (layout.reloc_size);
reloc_section->raw_data_offset = grub_cpu_to_le32 (reloc_addr); reloc_section->raw_data_offset = grub_host_to_target32 (reloc_addr);
reloc_section->characteristics reloc_section->characteristics
= grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
| GRUB_PE32_SCN_MEM_DISCARDABLE | GRUB_PE32_SCN_MEM_DISCARDABLE