From patchwork Wed Sep 5 13:26:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dunrong huang X-Patchwork-Id: 181858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 065352C008D for ; Wed, 5 Sep 2012 23:27:33 +1000 (EST) Received: from localhost ([::1]:42178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9Fdj-0004ku-2t for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2012 09:27:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9FdW-0004kn-V3 for qemu-devel@nongnu.org; Wed, 05 Sep 2012 09:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9FdR-0003HM-77 for qemu-devel@nongnu.org; Wed, 05 Sep 2012 09:27:18 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:33938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9FdR-0003HI-19; Wed, 05 Sep 2012 09:27:13 -0400 Received: by dadn15 with SMTP id n15so379467dad.4 for ; Wed, 05 Sep 2012 06:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=hVPxSrmnSnvohyabkT7W+sLtRoyMGYzNR0Sg2qGwGz0=; b=ouq+Cn+uP+XXBXrxddbrpe/DzaX4CSFKIthqmUP4Bay4tCEXs/oTEbbaWEOMrz1Ogp bI6W3u9jCL/5iiv7YPMqLYP3gJQ+p0/vuSsTsNtWXTv8UKduX1R2DOYMMhzJrGXCopRq X1/9rc9F84TgXJOI0vr8Rt4ujjUn91s2AZfo3lydgIW4IfACC4iEQx3GaJygOlNAwrEV 5I1a51Os/kSE2i+gy4qsGovRNtQ1ST06dsrsbmba38IbWGggQpzDUGSRleDAQ9jpJg5a a5vCXbtOC5kVrrLIT56RAjjVhkukOWWikfaWrphlmTBkh76DsayIE7Sf2dljH3oexe49 0lWw== Received: by 10.68.241.228 with SMTP id wl4mr54186162pbc.51.1346851632187; Wed, 05 Sep 2012 06:27:12 -0700 (PDT) Received: from localhost.localdomain ([106.3.103.158]) by mx.google.com with ESMTPS id gh7sm1437989pbc.29.2012.09.05.06.27.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Sep 2012 06:27:10 -0700 (PDT) From: riegamaths@gmail.com To: qemu-devel Date: Wed, 5 Sep 2012 21:26:22 +0800 Message-Id: <1346851582-9296-1-git-send-email-riegamaths@gmail.com> X-Mailer: git-send-email 1.7.12 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: qemu-trivial , Dunrong Huang Subject: [Qemu-devel] =?utf-8?q?=5BPATCH=5D_block=3A_Don=27t_forget_to_del?= =?utf-8?q?ete_temporary_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 From: Dunrong Huang The caller would not delete temporary file after failed get_tmp_filename(). Signed-off-by: Dunrong Huang --- block.c | 6 +++++- 1 个文件被修改，插入 5 行(+)，删除 1 行(-) diff --git a/block.c b/block.c index 074987e..2bc9f75 100644 --- a/block.c +++ b/block.c @@ -433,7 +433,11 @@ int get_tmp_filename(char *filename, int size) return -EOVERFLOW; } fd = mkstemp(filename); - if (fd < 0 || close(fd)) { + if (fd < 0) { + return -errno; + } + if (close(fd) != 0) { + unlink(filename); return -errno; } return 0;