From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40561 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3x1m-0002Up-BU for qemu-devel@nongnu.org; Thu, 07 Oct 2010 16:25:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3x1Z-0000EG-OW for qemu-devel@nongnu.org; Thu, 07 Oct 2010 16:25:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3x1Z-0000D9-FG for qemu-devel@nongnu.org; Thu, 07 Oct 2010 16:25:09 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o97KP7mi010237 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Oct 2010 16:25:07 -0400 From: Eduardo Habkost Date: Thu, 7 Oct 2010 17:25:04 -0300 Message-Id: <1286483105-9768-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1286483105-9768-1-git-send-email-ehabkost@redhat.com> References: <1286483105-9768-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] fix fd leak on one qcow2_create2() error path List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf When getting an invalid cluster size, the open fd must be closed before qcow2_create() returns an error. Signed-off-by: Eduardo Habkost --- block/qcow2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index ee3481b..c5fb28e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -918,7 +918,8 @@ static int qcow_create2(const char *filename, int64_t total_size, "%d and %dk\n", 1 << MIN_CLUSTER_BITS, 1 << (MAX_CLUSTER_BITS - 10)); - return -EINVAL; + ret = -EINVAL; + goto exit_close; } s->cluster_size = 1 << s->cluster_bits; @@ -1052,6 +1053,8 @@ static int qcow_create2(const char *filename, int64_t total_size, exit: qemu_free(s->refcount_table); qemu_free(s->refcount_block); + +exit_close: close(fd); /* Preallocate metadata */ -- 1.6.5.5