From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5BPr-0005KD-GT for qemu-devel@nongnu.org; Fri, 02 Aug 2013 05:13:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V5BPi-0000PS-0k for qemu-devel@nongnu.org; Fri, 02 Aug 2013 05:12:55 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:57224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5BPh-0000Oe-AI for qemu-devel@nongnu.org; Fri, 02 Aug 2013 05:12:45 -0400 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Aug 2013 14:23:08 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 0F42F1258059 for ; Fri, 2 Aug 2013 14:32:00 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7292Po442860666 for ; Fri, 2 Aug 2013 14:32:25 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r7292R7d015223 for ; Fri, 2 Aug 2013 19:02:27 +1000 From: Xu Wang Date: Fri, 2 Aug 2013 05:02:15 -0400 Message-Id: <1375434137-4452-5-git-send-email-gesaint@linux.vnet.ibm.com> In-Reply-To: <1375434137-4452-1-git-send-email-gesaint@linux.vnet.ibm.com> References: <1375434137-4452-1-git-send-email-gesaint@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V5 4/6] block: Check infinite loop in bdrv_img_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, stefanha@gmail.com, wdongxu@linux.vnet.ibm.com, Xu Wang , xiawenc@linux.vnet.ibm.com From: Xu Wang Backing file loop should be checked before qemu-img create command execution. If loop was found, qemu-img create should be stopped and an error was printed. Signed-off-by: Xu Wang --- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 1e64665..8bb63c2 100644 --- a/block.c +++ b/block.c @@ -4731,15 +4731,15 @@ void bdrv_img_create(const char *filename, const char *fmt, } backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE); + backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); if (backing_file && backing_file->value.s) { - if (!strcmp(filename, backing_file->value.s)) { - error_setg(errp, "Error: Trying to create an image with the " - "same filename as the backing file"); + if (bdrv_backing_file_loop_check(filename, fmt, + backing_file->value.s, + backing_fmt->value.s)) { + error_report("bdrv_img_create: loop exists, image create failed."); goto out; } } - - backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); if (backing_fmt && backing_fmt->value.s) { backing_drv = bdrv_find_format(backing_fmt->value.s); if (!backing_drv) { -- 1.8.1.4