From nobody Tue Apr 7 06:15:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1773645071; cv=none; d=zohomail.com; s=zohoarc; b=AezT+6DXx2zkmclv/DBXXwyJfqdeHZbQ0KDBhncguiBaQUga2foClItS7s+Sa1OTE1JaoYkKgxce9R9vJ475BR4yYbTYmNIG0ZFXNCCjvq9yQjz/moyX/iALDSFkoJssMjuoPoCXbVSNN9eBOBSF1l/25xurdq7AQcGezBhik7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773645071; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JIblTnwUwOXA+jwfMKJEsI7L6ZbfLWkGXchhibpTagc=; b=AWijmbCAe/agYBKyWaDnqUcNuD+uGHs+qhykgwfFD0fscCUKeKAcSQ3VnYUid7jDXcND1DuhCY1sKKEMoJEp59aeZuu5AX965oUbB9632U4MP/A7nJvNDQBLvoLmrqQqAIJTGiFxGm6HjXuTlGlnPOeSjosg3DM0iUYZulLxcco= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773645071491666.0076504698222; Mon, 16 Mar 2026 00:11:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w226O-0007f6-AV; Mon, 16 Mar 2026 03:11:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w225k-0007VM-II; Mon, 16 Mar 2026 03:10:25 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w225d-0007kb-MY; Mon, 16 Mar 2026 03:10:15 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 82759193C24; Mon, 16 Mar 2026 10:10:02 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 806E038004C; Mon, 16 Mar 2026 10:10:05 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773645002; bh=vvOQEhgJE84u8KF7BBEN5DfHHC1YU/ts6vzHN7FBIOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=k7Wk2BptcJYQlSYs9TDogLNS830u3pF/NREVR1szee1fWWAbEWMPu0xLwIdFcBQKp o3wgEsPY0slFxdNSfudw+zWIMoqzlk7ycRc64/m0LWdjrgx6vtvPoF3MIwB5Cxiji4 cjxb/XmRnwKQ2B4v2xuS493wonEcVV3uxMg6CyJrI6SbFxfSK9YzlOaGLZjLUg0WDu RVyNHUM3OUFglvJhqaZRYMcwHLNDa3SIWvpU8bC7CwarwKWgK7e++thgrTonQdczby hrR40u/Y70/VA9t+ouAogy0k3c/FYcCppERYSXVOeLF/0SeExOK9LMJ9DmLvRducqa 9Kz7wtAcKcFoA== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Sergei Heifetz , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 02/14] migration/savevm.c: reorder usage and assertion of mis->from_src_file Date: Mon, 16 Mar 2026 10:09:50 +0300 Message-ID: <20260316071005.91624-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260316071005.91624-1-mjt@tls.msk.ru> References: <20260316071005.91624-1-mjt@tls.msk.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @tls.msk.ru) X-ZM-MESSAGEID: 1773645072898154100 Content-Type: text/plain; charset="utf-8" From: Sergei Heifetz Reorder the code so the assertion of mis->from_src_file occurs before the call to migration_ioc_unregister_yank_from_file, which dereferences it in qemu_file_get_ioc. Fixes: 39675ffffb3394 ("migration: Move the yank unregister of channel_clos= e out") Signed-off-by: Sergei Heifetz Reviewed-by: Laurent Vivier Reviewed-by: Peter Xu Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 197c89e0e6..dd58f2a705 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2875,13 +2875,14 @@ static bool postcopy_pause_incoming(MigrationIncomi= ngState *mis) =20 assert(migrate_postcopy_ram()); =20 + assert(mis->from_src_file); + /* * Unregister yank with either from/to src would work, since ioc behin= d it * is the same */ migration_ioc_unregister_yank_from_file(mis->from_src_file); =20 - assert(mis->from_src_file); qemu_file_shutdown(mis->from_src_file); qemu_fclose(mis->from_src_file); mis->from_src_file =3D NULL; --=20 2.47.3