From nobody Tue Apr 7 23:44:30 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; dmarc=pass(p=none dis=none) header.from=yandex-team.com ARC-Seal: i=1; a=rsa-sha256; t=1773234993; cv=none; d=zohomail.com; s=zohoarc; b=kfFmhZm96EfermzU1k5z0oe9XqbOy6+d1FJoWmZ8yBM4y8aPHtHKYsvq6y0/3KNbnuSNgdxPoO0KoTrX9wwFo/KCiNcYPVof/cvfGUoiuMz7ydr95tzrLRzhbda7lppcCwWNEU5PVr/WoZ/R4KyUBN6erLGJSnbkfpe5Xl4L8lA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773234993; 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=aib1BAh5M0/WVaVVuWFg17CTYoL9n/LthhkUS9jzeSU=; b=OeJUyL32/vRtvSYP+Moulgq1vjnC+aTAkfz6b1lBG5ze8YH59lq9VG8SwDZZq3ao2y55ReStyMPf5Xhs5TIG9zktI+7bOO0tEkytZos3o5P6A6Av5UaPquoTjGGhji2L8PkPWjK8qIb+FsLXmVFGo1qEbgG6UkBvlcb0XOOm7mM= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177323499267470.96172786331476; Wed, 11 Mar 2026 06:16:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0JPc-0000ow-In; Wed, 11 Mar 2026 09:15:44 -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 1w0JPR-0000mo-Bm; Wed, 11 Mar 2026 09:15:33 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0JPN-0000Mb-Gf; Wed, 11 Mar 2026 09:15:33 -0400 Received: from mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:bf1f:0:640:c739:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 156A580606; Wed, 11 Mar 2026 16:15:25 +0300 (MSK) Received: from heifetz-lin.yandex-team.ru (unknown [2a02:6bf:8080:d28::1:5]) by mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id MFGaO30AdeA0-WCu8oipK; Wed, 11 Mar 2026 16:15:24 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1773234924; bh=aib1BAh5M0/WVaVVuWFg17CTYoL9n/LthhkUS9jzeSU=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=VNFO+oW8qUqstjz8iawyeIUPsWLxQ9qgZUSfuDp0wHLBSDHKlcGAmcbbodSQeTvwp SC5xvDIWTUNV+CoRjOVvK/AUQC4X/3I10UwmE4ocVFgVcWQXnNn7nRtX47Ghcu9FFT 2a3D43cyXKVsfXJGjvnJUQ8ATiYyUciOQLERYJeQ= Authentication-Results: mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.com From: Sergei Heifetz To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Ani Sinha , qemu-trivial@nongnu.org, Laurent Vivier Subject: [PATCH v4 1/4] migration/savevm.c: reorder usage and assertion of mis->from_src_file Date: Wed, 11 Mar 2026 18:15:19 +0500 Message-Id: <20260311131522.58600-2-heifetz@yandex-team.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260311131522.58600-1-heifetz@yandex-team.com> References: <20260311131522.58600-1-heifetz@yandex-team.com> 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=178.154.239.200; envelope-from=heifetz@yandex-team.com; helo=forwardcorp1d.mail.yandex.net X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-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 @yandex-team.com) X-ZM-MESSAGEID: 1773234995882158500 Content-Type: text/plain; charset="utf-8" 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 Acked-by: Fabiano Rosas --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 3dc812a7bbb..930a3391e35 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2885,13 +2885,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.34.1