From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 3 Feb 2008 03:37:46 +0000 (+0000)
Subject: Simplify guess_disk_lchs - should fix Windows stack corruption spotted by TeLeMan... 
X-Git-Tag: xen-3.3.0-rc1~407
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c717d8bf13d4c24372c4885eefa821ec76378d2b;p=qemu-xen-4.3-testing.git

Simplify guess_disk_lchs - should fix Windows stack corruption spotted by TeLeMan (patch by Tristan Gingold).


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3953 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/ide.c b/hw/ide.c
index 0e883b3b9..25f5b9f8e 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -2474,22 +2474,17 @@ struct partition {
 static int guess_disk_lchs(IDEState *s,
                            int *pcylinders, int *pheads, int *psectors)
 {
-    uint8_t *buf;
+    uint8_t *buf = s->io_buffer;
     int ret, i, heads, sectors, cylinders;
     struct partition *p;
     uint32_t nr_sects;
 
-    buf = qemu_memalign(512, 512);
-    if (buf == NULL)
-        return -1;
     ret = bdrv_read(s->bs, 0, buf, 1);
     if (ret < 0) {
-        qemu_free(buf);
         return -1;
     }
     /* test msdos magic */
     if (buf[510] != 0x55 || buf[511] != 0xaa) {
-        qemu_free(buf);
         return -1;
     }
     for(i = 0; i < 4; i++) {
@@ -2512,11 +2507,9 @@ static int guess_disk_lchs(IDEState *s,
             printf("guessed geometry: LCHS=%d %d %d\n",
                    cylinders, heads, sectors);
 #endif
-            qemu_free(buf);
             return 0;
         }
     }
-    qemu_free(buf);
     return -1;
 }