From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L3FIn-0006Sa-Ni for qemu-devel@nongnu.org; Thu, 20 Nov 2008 14:34:57 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L3FIl-0006RF-Pq for qemu-devel@nongnu.org; Thu, 20 Nov 2008 14:34:57 -0500 Received: from [199.232.76.173] (port=41989 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3FIl-0006RA-L5 for qemu-devel@nongnu.org; Thu, 20 Nov 2008 14:34:55 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:35129) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L3FIl-0001JX-AD for qemu-devel@nongnu.org; Thu, 20 Nov 2008 14:34:55 -0500 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e31.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id mAKJXrH4023083 for ; Thu, 20 Nov 2008 12:33:53 -0700 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mAKJYi6L031290 for ; Thu, 20 Nov 2008 12:34:44 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id mAKJYiSd031025 for ; Thu, 20 Nov 2008 12:34:44 -0700 From: Hollis Blanchard Date: Thu, 20 Nov 2008 13:34:38 -0600 Message-Id: In-Reply-To: <1227209682-28842-1-git-send-email-hollisb@us.ibm.com> References: <1227209682-28842-1-git-send-email-hollisb@us.ibm.com> Subject: [Qemu-devel] [PATCH 1/5] uImage: don't leak file data or file descriptor Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hollis Blanchard Signed-off-by: Hollis Blanchard --- Changes from v1: - Combine the failure and success return paths to avoid leaking the file descriptor as well. --- loader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/loader.c b/loader.c index 8722909..e7e6abc 100644 --- a/loader.c +++ b/loader.c @@ -354,6 +354,7 @@ int load_uboot(const char *filename, target_ulong *ep, int *is_linux) 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 @@ int load_uboot(const char *filename, target_ulong *ep, int *is_linux) 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 @@ int load_uboot(const char *filename, target_ulong *ep, int *is_linux) *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; } -- 1.5.6.5