vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/loader/multiboot_elfxx.c (grub_multiboot_load_elf): Fix

Browse source 
incorrect nesting of #if's.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-09 23:53:27 +01:00
parent a4ea2dff4b
commit 6f48ca0143
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/multiboot_elfxx.c (grub_multiboot_load_elf): Fix
incorrect nesting of #if's.
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/lsacpi.c (disp_acpi_xsdt_table): #if'-out the * grub-core/commands/lsacpi.c (disp_acpi_xsdt_table): #if'-out the

4
grub-core/loader/multiboot_elfxx.c
View file

@ -73,7 +73,8 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, const char *filename, voi
if (ehdr->e_phoff + ehdr->e_phnum * ehdr->e_phentsize > MULTIBOOT_SEARCH) if (ehdr->e_phoff + ehdr->e_phnum * ehdr->e_phentsize > MULTIBOOT_SEARCH)
return grub_error (GRUB_ERR_BAD_OS, "program header at a too high offset"); return grub_error (GRUB_ERR_BAD_OS, "program header at a too high offset");
#if defined (MULTIBOOT_LOAD_ELF64) && defined (__mips) #ifdef MULTIBOOT_LOAD_ELF64
# ifdef __mips
/* We still in 32-bit mode. */ /* We still in 32-bit mode. */
if (ehdr->e_entry < 0xffffffff80000000ULL) if (ehdr->e_entry < 0xffffffff80000000ULL)
return grub_error (GRUB_ERR_BAD_OS, "invalid entry point for ELF64"); return grub_error (GRUB_ERR_BAD_OS, "invalid entry point for ELF64");
@ -81,6 +82,7 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, const char *filename, voi
/* We still in 32-bit mode. */ /* We still in 32-bit mode. */
if (ehdr->e_entry > 0xffffffff) if (ehdr->e_entry > 0xffffffff)
return grub_error (GRUB_ERR_BAD_OS, "invalid entry point for ELF64"); return grub_error (GRUB_ERR_BAD_OS, "invalid entry point for ELF64");
# endif
#endif #endif
phdr_base = (char *) buffer + ehdr->e_phoff; phdr_base = (char *) buffer + ehdr->e_phoff;