[patch] fix inifinite boot with >=gcc-4.6

905_all_grub-0.97-gcc46.patch (text/plain), 1.68 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2012-05-26 09:09:09 UTC

Fix infinite boot loop with >=gcc-4.6

https://bugs.gentoo.org/show_bug.cgi?id=360513
http://code.google.com/p/grub4dos-chenall/source/browse/trunk/stage2/bios.c?spec=svn290&r=290

Patch is a part of grub4dos project

--- a/stage2/bios.c
+++ b/stage2/bios.c
@@ -60,7 +60,18 @@
 	unsigned short blocks;
 	unsigned long buffer;
 	unsigned long long block;
-      } __attribute__ ((packed)) dap;
+
+	/* This structure is passed in the stack. A buggy BIOS could write
+	 * garbage data to the tail of the struct and hang the machine. So
+	 * we need this protection. - Tinybit
+	 */
+	unsigned char dummy[16];
+      } __attribute__ ((packed)) *dap;
+
+      /* Even the above protection is not enough to avoid stupid actions by
+       * buggy BIOSes. So we do it in the 0040:0000 segment. - Tinybit
+       */
+      dap = (struct disk_address_packet *)0x580;
 
       /* XXX: Don't check the geometry by default, because some buggy
 	 BIOSes don't return the number of total sectors correctly,
@@ -72,15 +83,15 @@
 
       /* FIXME: sizeof (DAP) must be 0x10. Should assert that the compiler
 	 can't add any padding.  */
-      dap.length = sizeof (dap);
-      dap.block = sector;
-      dap.blocks = nsec;
-      dap.reserved = 0;
+      dap->length = 0x10;
+      dap->block = sector;
+      dap->blocks = nsec;
+      dap->reserved = 0;
       /* This is undocumented part. The address is formated in
 	 SEGMENT:ADDRESS.  */
-      dap.buffer = segment << 16;
+      dap->buffer = segment << 16;
       
-      err = biosdisk_int13_extensions ((read + 0x42) << 8, drive, &dap);
+      err = biosdisk_int13_extensions ((read + 0x42) << 8, drive, dap);
 
 /* #undef NO_INT13_FALLBACK */
 #ifndef NO_INT13_FALLBACK