From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L3Hc3-0006SK-Ok
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:02:59 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L3Hc2-0006PG-1s
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:02:59 -0500
Received: from [199.232.76.173] (port=55890 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L3Hc1-0006P1-Of
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:02:57 -0500
Received: from savannah.gnu.org ([199.232.41.3]:57901 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L3Hc1-0006bN-Af
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:02:57 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L3Hc0-00037A-TR
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:02:56 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1L3Hc0-000376-LO
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:02:56 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1L3Hc0-000376-LO@cvs.savannah.gnu.org>
Date: Thu, 20 Nov 2008 22:02:56 +0000
Subject: [Qemu-devel] [5761] uImage: don't leak file data or file descriptor
	(Hollis Blanchard)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5761
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5761
Author:   aliguori
Date:     2008-11-20 22:02:56 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
uImage: don't leak file data or file descriptor (Hollis Blanchard)

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/loader.c

Modified: trunk/loader.c
===================================================================
--- trunk/loader.c	2008-11-20 16:46:21 UTC (rev 5760)
+++ trunk/loader.c	2008-11-20 22:02:56 UTC (rev 5761)
@@ -354,6 +354,7 @@
     uboot_image_header_t h;
     uboot_image_header_t *hdr = &h;
     uint8_t *data = NULL;
+    int ret = -1;
 
     fd = open(filename, O_RDONLY | O_BINARY);
     if (fd < 0)
@@ -361,23 +362,23 @@
 
     size = read(fd, hdr, sizeof(uboot_image_header_t));
     if (size < 0)
-        goto fail;
+        goto out;
 
     bswap_uboot_header(hdr);
 
     if (hdr->ih_magic != IH_MAGIC)
-        goto fail;
+        goto out;
 
     /* TODO: Implement Multi-File images.  */
     if (hdr->ih_type == IH_TYPE_MULTI) {
         fprintf(stderr, "Unable to load multi-file u-boot images\n");
-        goto fail;
+        goto out;
     }
 
     /* TODO: Implement compressed images.  */
     if (hdr->ih_comp != IH_COMP_NONE) {
         fprintf(stderr, "Unable to load compressed u-boot images\n");
-        goto fail;
+        goto out;
     }
 
     /* TODO: Check CPU type.  */
@@ -391,20 +392,20 @@
     *ep = hdr->ih_ep;
     data = qemu_malloc(hdr->ih_size);
     if (!data)
-        goto fail;
+        goto out;
 
     if (read(fd, data, hdr->ih_size) != hdr->ih_size) {
         fprintf(stderr, "Error reading file\n");
-        goto fail;
+        goto out;
     }
 
     cpu_physical_memory_write_rom(hdr->ih_load, data, hdr->ih_size);
 
-    return hdr->ih_size;
+    ret = hdr->ih_size;
 
-fail:
+out:
     if (data)
         qemu_free(data);
     close(fd);
-    return -1;
+    return ret;
 }