From: H. Peter Anvin <hpa@linux.intel.com>
Date: Tue, 14 Apr 2009 19:01:07 +0000 (-0700)
Subject: MEMDISK: fix MBR geometry extraction
X-Git-Tag: syslinux-3.75-pre2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62ffbac86c660e537af0be0fb1c7457ee25bf53e;p=profile%2Fivi%2Fsyslinux.git

MEMDISK: fix MBR geometry extraction

Fix the MBR geometry extraction; there was an off-by-2 error in the
MBR signature offset.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

diff --git a/memdisk/setup.c b/memdisk/setup.c
index 0fee982..6507e56 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -565,7 +565,7 @@ const struct geometry *get_disk_image_geometry(uint32_t where, uint32_t size)
 	      
 	hd_geometry.driveno = 0x80; /* Assume hard disk */
 	
-	if (*(uint16_t *)((char *)where+512) == 0xaa55)
+	if (*(uint16_t *)((char *)where+512-2) == 0xaa55)
 	  for ( i = 0 ; i < 4 ; i++ ) {
 	    if ( ptab[i].type && !(ptab[i].active & 0x7f) ) {
 	      s = (ptab[i].start_s & 0x3f);