grub2 ChangeLog loader/i386/pc/linux.c

[Yoshinori K. Okuji]

CVSROOT:        /cvsroot/grub
Module name:    grub2
Changes by:     Yoshinori K. Okuji <okuji>      06/06/08 22:30:25

Modified files:
        .              : ChangeLog 
        loader/i386/pc : linux.c 

Log message:
        2006-06-09  Yoshinori K. Okuji  <address@hidden>
        
                * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Make sure 
that
                ADDR_MAX does not exceed GRUB_LINUX_INITRD_MAX_ADDRESS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/grub2/ChangeLog?cvsroot=grub&r1=1.282&r2=1.283
http://cvs.savannah.gnu.org/viewcvs/grub2/loader/i386/pc/linux.c?cvsroot=grub&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/grub/grub2/ChangeLog,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -b -r1.282 -r1.283
--- ChangeLog   8 Jun 2006 12:38:44 -0000       1.282
+++ ChangeLog   8 Jun 2006 22:30:25 -0000       1.283
@@ -1,3 +1,8 @@
+2006-06-09  Yoshinori K. Okuji  <address@hidden>
+
+       * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Make sure that
+       ADDR_MAX does not exceed GRUB_LINUX_INITRD_MAX_ADDRESS.
+
 2006-06-07  Jeroen Dekkers  <address@hidden>
 
        * include/grub/types.h (grub_host_addr_t): Rename to

Index: loader/i386/pc/linux.c
===================================================================
RCS file: /cvsroot/grub/grub2/loader/i386/pc/linux.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- loader/i386/pc/linux.c      5 Jun 2006 19:59:33 -0000       1.13
+++ loader/i386/pc/linux.c      8 Jun 2006 22:30:25 -0000       1.14
@@ -322,7 +322,15 @@
 
   /* Get the highest address available for the initrd.  */
   if (grub_le_to_cpu16 (lh->version) >= 0x0203)
+    {
     addr_max = grub_cpu_to_le32 (lh->initrd_addr_max);
+
+      /* XXX in reality, Linux specifies a bogus value, so
+        it is necessary to make sure that ADDR_MAX does not exceed
+        0x3fffffff.  */
+      if (addr_max > GRUB_LINUX_INITRD_MAX_ADDRESS)
+       addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;
+    }
   else
     addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;