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

2009-11-08 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve
        error message for excessively large memory map.
This commit is contained in:
Robert Millan 2009-11-08 20:02:16 +00:00
parent c02a733496
commit b97b7b914b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-11-08 Robert Millan <rmh.grub@aybabtu.com>
* kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve
error message for excessively large memory map.
2009-11-08 Robert Millan <rmh.grub@aybabtu.com> 2009-11-08 Robert Millan <rmh.grub@aybabtu.com>
* autogen.sh: Use `sh gendistlist.sh' to avoid reliing on * autogen.sh: Use `sh gendistlist.sh' to avoid reliing on

3
kern/i386/multiboot_mmap.c
View file

@ -51,7 +51,8 @@ grub_machine_mmap_init ()
/* Move the memory map to a safe place. */ /* Move the memory map to a safe place. */
if (kern_multiboot_info.mmap_length > sizeof (mmap_entries)) if (kern_multiboot_info.mmap_length > sizeof (mmap_entries))
{ {
grub_printf ("WARNING: Memory map size exceeds limit; it will be truncated\n"); grub_printf ("WARNING: Memory map size exceeds limit (0x%x > 0x%x); it will be truncated\n",
kern_multiboot_info.mmap_length, sizeof (mmap_entries));
kern_multiboot_info.mmap_length = sizeof (mmap_entries); kern_multiboot_info.mmap_length = sizeof (mmap_entries);
} }
grub_memmove (mmap_entries, (void *) kern_multiboot_info.mmap_addr, kern_multiboot_info.mmap_length); grub_memmove (mmap_entries, (void *) kern_multiboot_info.mmap_addr, kern_multiboot_info.mmap_length);