* kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry

	before calling BIOS.

diff --git a/ChangeLog b/ChangeLog
index 081ea4a1d4c988ea392747271531ecd3ff0398d1..02d16e83538705dca6babcc2e2e0998e22b72bb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry
+       before calling BIOS.
+
 2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/i18n.h: Always enable grub_gettext.

diff --git a/kern/i386/pc/mmap.c b/kern/i386/pc/mmap.c
index 52d8fd5971267aa4e8973554769dab6daed51be9..72a6b35397fcf23adecd4d962088d98ca9c35456 100644 (file)
--- a/kern/i386/pc/mmap.c
+++ b/kern/i386/pc/mmap.c
@@ -20,6 +20,7 @@
 #include <grub/machine/memory.h>
 #include <grub/err.h>
 #include <grub/types.h>
+#include <grub/misc.h>
 
 grub_err_t
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
@@ -28,6 +29,8 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
   struct grub_machine_mmap_entry *entry
     = (struct grub_machine_mmap_entry *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
 
+  grub_memset (entry, 0, sizeof (entry));
+
   /* Check if grub_get_mmap_entry works.  */
   cont = grub_get_mmap_entry (entry, 0);
 
@@ -43,6 +46,8 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
        if (! cont)
          break;
 
+       grub_memset (entry, 0, sizeof (entry));
+
        cont = grub_get_mmap_entry (entry, cont);
       }
     while (entry->size);