From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEibv-0004wc-JK for qemu-devel@nongnu.org; Sat, 15 Feb 2014 12:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEibq-0002pI-Jp for qemu-devel@nongnu.org; Sat, 15 Feb 2014 12:01:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEibq-0002p4-BB for qemu-devel@nongnu.org; Sat, 15 Feb 2014 12:00:58 -0500 From: Max Reitz Date: Sat, 15 Feb 2014 18:03:21 +0100 Message-Id: <1392483801-15830-1-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] block: Unlink temporary file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz If the image file cannot be opened and was created as a temporary file, it should be deleted; thus, in this case, we should jump to the "unlink_and_fail" label and not just to "fail". Reported-by: Beno=C3=AEt Canet Signed-off-by: Max Reitz --- This patch's context depends on my bdrv_open()/bdrv_file_open() series ("[PATCH v3 0/8] block: Integrate bdrv_file_open() into bdrv_open()"). --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 62161bd..51c77b0 100644 --- a/block.c +++ b/block.c @@ -1308,7 +1308,7 @@ int bdrv_open(BlockDriverState **pbs, const char *f= ilename, bdrv_open_flags(bs, flags | BDRV_O_UNMAP) | BDRV_O_PROTOCOL, true, &local_err); if (ret < 0) { - goto fail; + goto unlink_and_fail; } =20 /* Find the right image format driver */ --=20 1.8.5.4