From nobody Fri May 3 03:31:51 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677522941; cv=none; d=zohomail.com; s=zohoarc; b=JZR+s5bnQI/QwJs/tU/JCyN+9lF37re+IKWOa5cDvbs2KkuukfPFcoqxN32d1PR1NRGrTV0dpUzxSfxnlv708sgI3H2UVianWiq4Rj2+OrAdDWHVWC5ir+Y3BEqXNWWvNdpXnbNmFcX7uqqbkrrk4xb2pED527mwEVaQ0EINUqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677522941; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Qe7t4/2DJcxXKXDU/ds6vqSkl1whlvfe9rcLF5b6OqY=; b=WveRcEvV+WiX6syRBPoci0dMP6p4qfsS9gc0IfCCQ0DLYoEDx4OLxxsr0nkTLhZmH/O1Tfu9hlmOlEagXUxc8vD7gc4zIaJW+8K8KZt8CHWq2DuprmPJeImDVyzfxaDbPmfs7VkjO+75+yfe/Gi5ZaAPTOZmDIn+oY4KjLK2lsU= 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+importer2=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 1677522941159537.6473762115486; Mon, 27 Feb 2023 10:35:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWiLP-0002fb-LY; Mon, 27 Feb 2023 13:35:27 -0500 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 1pWiLN-0002TF-DD for qemu-devel@nongnu.org; Mon, 27 Feb 2023 13:35:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWiLK-0004tb-La for qemu-devel@nongnu.org; Mon, 27 Feb 2023 13:35:25 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-27-GDhCGG6LPGSSqCFc8HC45Q-1; Mon, 27 Feb 2023 13:35:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3FEC73823A06; Mon, 27 Feb 2023 18:35:11 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.45.224.134]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8739F40C6EC4; Mon, 27 Feb 2023 18:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677522913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qe7t4/2DJcxXKXDU/ds6vqSkl1whlvfe9rcLF5b6OqY=; b=J3kZeh2xB60GF9yz1x82JzlLAS0QjZ1I1oNfltGD1jHBGFzX0D1zxvdW/E3RPfRzIDhySQ R7TfLnI94evE3VPvMAyS04/5PM3ChIcWncl9Nr9f+H+kyR8x5RCMRFVo1uJ1Y5DuEN7Rm1 2rcyuPI1MxG709+RO6RtYa6WJ/O4mcY= X-MC-Unique: GDhCGG6LPGSSqCFc8HC45Q-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, dgilbert@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, rjones@redhat.com, marcandre.lureau@redhat.com Cc: armbru@redhat.com, philmd@linaro.org, berrange@redhat.com Subject: [PATCH v2] test-vmstate: fix bad GTree usage, use-after-free Date: Mon, 27 Feb 2023 19:35:05 +0100 Message-Id: <20230227183505.280368-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677522941969100001 According to g_tree_foreach() documentation: "The tree may not be modified while iterating over it (you can't add/remove items)." A SIGSEV can be observed while running test-vmstate. Get rid of the node removal within the tree traversal. Also check the trees have the same number of nodes before the actual diff. Fixes: 9a85e4b8f6 ("migration: Support gtree migration") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1518 Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Eric Auger Reported-by: Richard W.M. Jones Reviewed-by: Richard W.M. Jones Tested-by: Richard W.M. Jones --- This is a respin of Marc-Andr=C3=A9's patch from Aug 2020, which can be found at https://lore.kernel.org/qemu-devel/20200827161826.1165971-1-marcandre.lurea= u@redhat.com/ This fell through the cracks and now we hit a SIGSEV --- tests/unit/test-vmstate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/unit/test-vmstate.c b/tests/unit/test-vmstate.c index 79357b29ca..0b7d5ecd68 100644 --- a/tests/unit/test-vmstate.c +++ b/tests/unit/test-vmstate.c @@ -1073,7 +1073,6 @@ static gboolean diff_tree(gpointer key, gpointer valu= e, gpointer data) struct match_node_data d =3D {tp->tree2, key, value}; =20 g_tree_foreach(tp->tree2, tp->match_node, &d); - g_tree_remove(tp->tree1, key); return false; } =20 @@ -1082,9 +1081,9 @@ static void compare_trees(GTree *tree1, GTree *tree2, { struct tree_cmp_data tp =3D {tree1, tree2, function}; =20 + assert(g_tree_nnodes(tree1) =3D=3D g_tree_nnodes(tree2)); g_tree_foreach(tree1, diff_tree, &tp); - assert(g_tree_nnodes(tree1) =3D=3D 0); - assert(g_tree_nnodes(tree2) =3D=3D 0); + g_tree_destroy(g_tree_ref(tree1)); } =20 static void diff_domain(TestGTreeDomain *d1, TestGTreeDomain *d2) --=20 2.38.1