From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIIjU-00042d-Oo for qemu-devel@nongnu.org; Tue, 06 Jun 2017 13:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIIjU-00067i-2q for qemu-devel@nongnu.org; Tue, 06 Jun 2017 13:57:32 -0400 From: Juan Quintela In-Reply-To: <20170606124953.GD5448@noname.redhat.com> (Kevin Wolf's message of "Tue, 6 Jun 2017 14:49:53 +0200") References: <20170606052438.35405-1-haoqf@linux.vnet.ibm.com> <20170606052438.35405-2-haoqf@linux.vnet.ibm.com> <20170606124953.GD5448@noname.redhat.com> Reply-To: quintela@redhat.com Date: Tue, 06 Jun 2017 19:57:16 +0200 Message-ID: <874lvt579f.fsf@secure.mitica> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v2 1/1] qemu/migration: fix the double free problem on from_src_file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: QingFeng Hao , famz@redhat.com, qemu-block@nongnu.org, liujbjl@linux.vnet.ibm.com, qemu-devel@nongnu.org, peterx@redhat.com, dgilbert@redhat.com, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com Kevin Wolf wrote: > Am 06.06.2017 um 07:24 hat QingFeng Hao geschrieben: >> In load_snapshot, mis->from_src_file is freed twice, the first free is by >> qemu_fclose, the second is by migration_incoming_state_destroy and >> it causes Illegal instruction exception. The fix is just to remove the >> first free. >> >> This problem is found by qemu-iotests case 068 since commit >> "660819b migration: shut src return path unconditionally". The error is: >> 068 1s ... - output mismatch (see 068.out.bad) >> --- tests/qemu-iotests/068.out 2017-05-06 01:00:26.417270437 +0200 >> +++ 068.out.bad 2017-06-03 13:59:55.360274640 +0200 >> @@ -6,6 +6,8 @@ >> QEMU X.Y.Z monitor - type 'help' for more information >> (qemu) savevm 0 >> (qemu) quit >> +./common.config: line 107: 242472 Illegal instruction (core dumped) ( if [ -n "${QEMU_NEED_PID}" ]; then >> + echo $BASHPID > "${QEMU_TEST_DIR}/qemu-${_QEMU_HANDLE}.pid"; >> +fi; exec "$QEMU_PROG" $QEMU_OPTIONS "$@" ) >> QEMU X.Y.Z monitor - type 'help' for more information >> -(qemu) quit >> -*** done >> +(qemu) *** done >> >> Signed-off-by: QingFeng Hao >> Reviewed-by: Dr. David Alan Gilbert >> Reviewed-by: Peter Xu > > Dave, as you only gave R-b rather than merging the patch, should this be > merged through the block tree? I got it. I will send a pull request later Today. > > Did we check other callers of migration_incoming_state_destroy()? > > For example, qmp_xen_load_devices_state() looks suspicious, too. > > I can't tell for postcopy_ram_listen_thread() - commit 660819b didn't > seem to remove a qemu_fclose() call there, but I can't see one left > behind either. Was the file leaked before commit 660819b or am I > missing something? I will take a look at those. Thanks, Juan.