commit 8d98734651a8a601980b6e57788f2ed6a4ea620a
author Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Fri Jan 06 16:57:44 2012 +0000
committer Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Fri Jan 13 10:36:59 2012 +0000
tree cb8c74cd622d5815df0565d4e50091af0ed58096
parent dabdf394258aaa040fa0e754d6d05d7833542033

vvfat: avoid leaking file descriptor in commit_one_file()

Reported-by: Dr David Alan Gilbert <davidagilbert@uk.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

block/vvfat.c

diff --git a/block/vvfat.c b/block/vvfat.c
index eeffc4a..9ef21dd 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -2218,6 +2218,7 @@
     }
     if (offset > 0) {
         if (lseek(fd, offset, SEEK_SET) != offset) {
+            close(fd);
             g_free(cluster);
             return -3;
         }
@@ -2238,11 +2239,13 @@
 	    (uint8_t*)cluster, (rest_size + 0x1ff) / 0x200);
 
         if (ret < 0) {
+            close(fd);
             g_free(cluster);
             return ret;
         }
 
         if (write(fd, cluster, rest_size) < 0) {
+            close(fd);
             g_free(cluster);
             return -2;
         }