From patchwork Mon Nov 30 17:21:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 39836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7BDB61007D2 for ; Tue, 1 Dec 2009 05:02:53 +1100 (EST) Received: from localhost ([127.0.0.1]:52660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFAaI-0004a9-O2 for incoming@patchwork.ozlabs.org; Mon, 30 Nov 2009 13:02:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFA2k-0003rU-So for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFA2c-0003jK-2R for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:04 -0500 Received: from [199.232.76.173] (port=36082 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFA2X-0003i5-Rr for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:27:58 -0500 Received: from david.siemens.de ([192.35.17.14]:22230) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFA2W-0004fk-D8 for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:27:57 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nAUHRp1M025458; Mon, 30 Nov 2009 18:27:51 +0100 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nAUHRo7t001962; Mon, 30 Nov 2009 18:27:50 +0100 Resent-From: Jan Kiszka Resent-To: Anthony Liguori Resent-Cc: qemu-devel , Liran Schour , Pierre Riteau Resent-Date: Mon, 30 Nov 2009 18:27:50 +0100 Resent-Message-Id: <4B140096.4060804@siemens.com> Resent-User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 From: Jan Kiszka To: Anthony Liguori Date: Mon, 30 Nov 2009 18:21:19 +0100 Message-ID: <20091130172119.22889.67026.stgit@mchn012c.ww002.siemens.net> In-Reply-To: <20091130172119.22889.28114.stgit@mchn012c.ww002.siemens.net> References: <20091130172119.22889.28114.stgit@mchn012c.ww002.siemens.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Resent-Date: Mon, 30 Nov 2009 12:28:04 -0500 Cc: qemu-devel@nongnu.org, Liran Schour , Pierre Riteau Subject: [Qemu-devel] [PATCH 01/23] migration: Fix use of file after release X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_fclose frees the passed file structure, but do_migrate_set_speed may access it later on. Fix it by setting file NULL in migrate_fd_cleanup and checking for this. Signed-off-by: Jan Kiszka --- migration.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/migration.c b/migration.c index 3ae0be8..dcde7c3 100644 --- a/migration.c +++ b/migration.c @@ -118,12 +118,11 @@ void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) } max_throttle = (uint32_t)d; - s = migrate_to_fms(current_migration); - if (s) { + s = migrate_to_fms(current_migration); + if (s && s->file) { qemu_file_set_rate_limit(s->file, max_throttle); } - } /* amount of nanoseconds we are willing to wait for migration to be down. @@ -209,6 +208,7 @@ void migrate_fd_cleanup(FdMigrationState *s) if (s->file) { dprintf("closing file\n"); qemu_fclose(s->file); + s->file = NULL; } if (s->fd != -1)