From patchwork Fri Jan 13 10:51:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 135785 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3772AB6EF7 for ; Fri, 13 Jan 2012 21:53:01 +1100 (EST) Received: from localhost ([::1]:47571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rlekj-0007NN-Jl for incoming@patchwork.ozlabs.org; Fri, 13 Jan 2012 05:52:57 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlekC-0005Xm-8R for qemu-devel@nongnu.org; Fri, 13 Jan 2012 05:52:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rlek6-0001Do-At for qemu-devel@nongnu.org; Fri, 13 Jan 2012 05:52:24 -0500 Received: from e06smtp18.uk.ibm.com ([195.75.94.114]:43732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rlek5-0001Df-S6 for qemu-devel@nongnu.org; Fri, 13 Jan 2012 05:52:18 -0500 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Jan 2012 10:52:16 -0000 Received: from d06nrmr1407.portsmouth.uk.ibm.com ([9.149.38.185]) by e06smtp18.uk.ibm.com ([192.168.101.148]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 13 Jan 2012 10:51:50 -0000 Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0DApoBH2289674 for ; Fri, 13 Jan 2012 10:51:50 GMT Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0DApoOi001279 for ; Fri, 13 Jan 2012 10:51:50 GMT Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.31]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q0DApnOu001265; Fri, 13 Jan 2012 10:51:49 GMT From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 13 Jan 2012 10:51:32 +0000 Message-Id: <1326451900-18325-5-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1326451900-18325-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1326451900-18325-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12011310-6892-0000-0000-000000B1A381 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.114 Cc: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 04/12] vvfat: avoid leaking file descriptor in commit_one_file() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reported-by: Dr David Alan Gilbert Signed-off-by: Stefan Hajnoczi --- block/vvfat.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) 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 @@ static int commit_one_file(BDRVVVFATState* s, } if (offset > 0) { if (lseek(fd, offset, SEEK_SET) != offset) { + close(fd); g_free(cluster); return -3; } @@ -2238,11 +2239,13 @@ static int commit_one_file(BDRVVVFATState* s, (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; }