From nobody Tue Nov 4 15:16:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530540539312918.396839443713; Mon, 2 Jul 2018 07:08:59 -0700 (PDT) Received: from localhost ([::1]:32998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzVi-0001hF-Hg for importer@patchew.org; Mon, 02 Jul 2018 10:08:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzTX-0000RT-Fn for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:06:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzTU-0003mR-Av for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:06:43 -0400 Received: from mail-he1eur02on0600.outbound.protection.outlook.com ([2a01:111:f400:fe05::600]:6611 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZzTT-0003kA-L9 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:06:40 -0400 Received: from localhost.localdomain (194.230.159.112) by VI1PR05MB4445.eurprd05.prod.outlook.com (2603:10a6:803:42::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Mon, 2 Jul 2018 14:06:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usi365.onmicrosoft.com; s=selector1-usi-ch; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1GUqg6cXEj/qfcusJYN5rVu2t2EC99cJMQEKAzC0jT0=; b=TNguIbrLXPRlVSpx3GYWpANzXDKJx040121vp0sR57D68iQ0RBhsif+TNZFDTn+qwj0Zy8wait+52bqwPTAzMr1aI6995W7eIaf/75FINIW78TBBzkuSVmB5/tovs9kTI+H70+4Mvy2BMfWm8CJvESM/8ojI6ymPZzxY+l7+Gyg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=emanuele.giuseppe.esposito@usi.ch; From: Emanuele Giuseppe Esposito To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 2 Jul 2018 16:05:58 +0200 Message-Id: <20180702140558.18267-1-esposem@usi.ch> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [194.230.159.112] X-ClientProxiedBy: HE1P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::28) To VI1PR05MB4445.eurprd05.prod.outlook.com (2603:10a6:803:42::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db127c39-e110-4a2d-4a6c-08d5e025048b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4445; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4445; 3:aaGD3qyarn/bTDKr2YNnJK7M6Cnzkztj20EGTq1fmeveqSJMCMS8R8NGpsqfaeb87owjx3JdJHxsFzx06VmsofahWLXcmDk9kQKJrn+oqDgQdkZenFAc4gfWFgEE155Ai3RtYk1W983ZDD1FW0i78NDACtP8XWt2nXcZg/B5u9ZM8WK0IdxOy/nySCHC1X4Gn1it5fAdCM56B/MCNXSAzgWzSuk7mdDdhqiHOcpnVf64SkmsgwgJP6Df7xeNOQKi; 25:RMcElN46IZRvaxOTzqEXd7unnJXEbTeg3JPNqXK255BFySAZnlsItFj+0wXR+jcx/l75U7Erucc94sQubXQsCATvdu9jI9rrdgp1DWaAuDiDtDvOP8LaTopCUR0djfOtn5bGPd9QEEy1T7p1hZOh7df7SCaI7Z7vAQNslp4zKeDi/aHj+PdPd8/9d7C21NVqKwGZ4UUb4On4c+LKYDSHNCVQ0JPccWR5uNk9lzNNR1X9/Kn5ypFtsiW1di8l+ddZpgUx8sonOEsnZFTAevQ2ZqglCQ9ewu6pVUX38DA3z96g4QLhlUyI8ej1KCVj6N853qCISlGWIAHbzJ7QzDy/2w==; 31:yuOozfexIB1O/bhzOky0OssSDkO1gbzhfa7VAXpbr5teDuBPOFbUKIthvYIlVa4XYIpCYZeXpXWLWXRQP0JS0uPTaEx1wnXYFTOifi4O+Vtk3yuW8DFoRvXzJY+dqBUQgsEficOCbmu34EOuTT6skSZ4b9sLiYAqv9o92ZINWDfBcSzG6Q9R2srg3XXwBHFUTUUCageQZphLS5+Rcu4aLudWQyY18YhysPFMHGf/38w= X-MS-TrafficTypeDiagnostic: VI1PR05MB4445: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4445; 20:4D6IgydIqHQjA1oMvSO1MmIIKX6G7MOnXqOSnYiKOX9kEbWcXVmBbrNSB0PiJwbv2vDHosgjk3kTh9el5WU9OCReK1NtsWOIaUZTenxpwgy2mAZYgGfvA6HoXWNXXDgQFM8gnpzGlS+hnNFrrh2Y2RiI50qGLZxCgd58NcndoSzScNNiIAoe2tyGnQB6zFE48hFrU67hgfqdMJyYt4UqTJdy+wURGr5BpQXtMapByF3wZV0+ds9x/3qlXxE/O71neAzsvKjL7dM+ewPs0kfOujqlzm6mkHOOIxSBfniS31Wy2c7x3rNf9vC0YlOja1JAGcNy+9wtjqMlopGn+wqOZVNgQGTdQhf5gFbKzFJL3/kHNqY5f4VpXvGufNZxUvPs9GxLalu8K1jRAdPX2ONcl91196+N1G7/uA3fOU+1CTs2HHs7R1ihuJIMj4DBaUXx; 4:lbKiltwSIvaZ3SxxTidorCdG+sMQvoYfzJI1nvlBRIrkxBXBru3spU8+BjVHIt8pQ69JJyWIKaVMbimjjHZnGfm29VWme3mgK2Jzk8MCYqjA87jS0/DP8ok+8EGUv1An+z+SPrbenPzrEcchjen19t+9SZ1FRU8kkg3875MOabkv35PHmzFyPnlANMv1YlIl9MeN6evLN7cr2v6UZuLtvTsrXB6yDlH9ODed4RVHmF9bix/Usz2YyC0Rve21hljV4z37ivjvZoq5zygYCGYacg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281529075)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4445; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4445; X-Forefront-PRVS: 07215D0470 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39840400004)(136003)(396003)(376002)(366004)(346002)(199004)(189003)(5660300001)(26005)(6116002)(48376002)(3846002)(47776003)(50466002)(68736007)(386003)(105586002)(6506007)(16526019)(6512007)(186003)(66066001)(14444005)(106356001)(2906002)(6486002)(33896004)(478600001)(51416003)(52116002)(36756003)(81166006)(81156014)(305945005)(4326008)(54906003)(16586007)(8936002)(74482002)(53936002)(6916009)(50226002)(786003)(316002)(25786009)(97736004)(1076002)(956004)(2616005)(8676002)(486006)(476003)(7736002)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4445; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: usi.ch does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR05MB4445; 23:tZBgnQ89wWoHI8xOUAsipV+smmiWjJ71EGv5T+YT4?= =?us-ascii?Q?XHVSxmvAEbGMky2gwPOO53ygSXVwrZn7ZIHYwmE+obJhU7pxdoMyVvklkRhj?= =?us-ascii?Q?RwP42V/iWzWasWmK41229eGwuMRB/SxRvLXVo0CSTqxuB3sj+PLLO8OLijvd?= =?us-ascii?Q?N8Z4T2JkHxAwV52bqIZyh5jQXtKNOGlO4zTSGXGdx0P7c/gYt6XJ+j0GJRVK?= =?us-ascii?Q?yVcfqHFyHoe1a6p9NvhqVqRpKaxfmcNbrrg/5dXLLOsK3RndW+abp/GKkaVw?= =?us-ascii?Q?YcekwJjpub7w6InVYMbwbObOaNbaKgMDOdWiNag/nGpY3WjrXoGGKr4Y8eci?= =?us-ascii?Q?vdnPKqdQZmMWv6Hdkn0YQMmq6gJxXLpj4nHMYPkykKeLK0dyw69E8V9pYbLh?= =?us-ascii?Q?Ehe1p/6YIlXMIgDlaMDBlY8g0CJG1AHtxRRsd228C3S13j4YZqBXaX1R5w/u?= =?us-ascii?Q?sxyQadv+csNb3UXgOQ0XzDFWhzumEhjGlMwWZwhGQsRI4NDG/xObJo6NOjMb?= =?us-ascii?Q?4lNo8kLGdMXZ1osyFGe/C/hiUM06E3dxLkF5HSAlTs9c5ofBRfZdtSAf9Wc6?= =?us-ascii?Q?R8rYnDbAtwgmm3VjdD63G4acGOuW0vBt8IRYFm7zsjCkOcep/2pCzVaM8oM7?= =?us-ascii?Q?ANrQG0qs98q5OkQmb7g/ckIP9wdRy1Gm9b0BsdQxIcoomDhFWF0fTtHNBJ9y?= =?us-ascii?Q?g6px84TbNKnBgI4XaUBJUosPcCU83WD9wxt71sjGwiYXlpd+IfCq6TOWATfK?= =?us-ascii?Q?Ivs8Bp57JSz0PrapfpadWJJ9pUTL7gReO7yVjJ+PTFzG6jYiK83bicxdjjUd?= =?us-ascii?Q?ywgWbffHxLsVjImPMBjrbFyREDwDXhgQTDy17NfE7JJQtlHpAovYa1bDQxdD?= =?us-ascii?Q?NUSySwNVoDFz2fXNhC5drrYXur+wzK2UU2N6mVBihfzWQEKBNUXWTw0QkiWb?= =?us-ascii?Q?5SnInvytwRirPIFrE4EoSkDGT0Wv30ikgq9af7z6pbOy7EvCfzsgU9U9rcjQ?= =?us-ascii?Q?T7dTA+y+ggOwWTHpAbm8O8zC30Vk2EHO6BUxUQajC9qcnePcy8wx4YSOhgZS?= =?us-ascii?Q?7DyfLcgm0yXlanz5M+DvEiSKc3cuVn99accSdlGiKEJ1AJQh448XMy/dg/1a?= =?us-ascii?Q?jU0Lr6lu7Mt4l7GV2KEU0kXGqphyN+zWtViJqSePqkhGSIsyjUlZi1KJ6ozl?= =?us-ascii?Q?Pbt1XqGJGGihzbweZf/giJr8hr0CLlZr+90cTneJ4rplXEpaUX1xf909w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: JwZmsQ7gJGB3eSbrXgfygBUomfRuMnL88xRBDNJu8qB0mpdytOEjM9L92wJV1aSDIHOvw4GvMQLyoRPAvCX8HMVbNDpssqwMYX8AINngf8B0YEbKDXg8uGZbKBM0I9oDQm0x9ZFu+1pF1ksJ2vpvOsoa2EetliN8BIse3hsr0rLfTlNbcCol7jsfVyC152wj0B8VM2XJ0dgVOonICu4Z7auo18KRG0Il5X7HS3ry8wkGDRqM156Yvdc+XYLrSWMVwsSkZX7IRI0jZl9DosYJfNYGPy12ioRTWWPnwX/xXQq5WCVlaHbONnXv77wAeBQjNB4PUlr1niXW7VCAXbz9qnxajFX41XeqLDb7WmFNuZI= X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4445; 6:gG4uzRyxudDASLP4jtN5z5+D2Uj5Y+YcySTu+9HhbHUFh4tuO0enqYe15CX8wc27/MGxSHFgJnp5eMQEE5h4YIn7cG/tt4i3nOD0dQvqqeiQhl0N4198X91xxqImYWEo0S49HiHG93BJjyy6tIeeFmFdgJMrRgpXNQq3JaZkKL3gtoRvP0PJXlTgz1thl2565pDwRhOWIBCMAVQiK64yrfnYNP4usWgOlazX7v0Va5i3ph8JOUQKtde9aD14Tpve6jwla7x938ceWUlF7hd+Nc/G3Hp4jc5X0LSg/7xMcqUMiHfAvrlOGdwyGZtFX6DYdSDEluQ8ipqUk6tttFvfng9nFIE+e96E7uYS2xK9bCsqUUvT816Y2eGNbYS8JoCUH6qe0t6mm+lLH3FV7RJNua+Qi5v/Gcd9xgzTU7SsglIKf5UdvavjvbJsmvxh1/uIdcnMh/7hwtHdjsbVz2rKpw==; 5:LFB3xR4qgUM5F02IONLC06R427IUvf2wo/o+5+vzYq3VmPhuGQyg2cIloKurymQ6V2YQLoWyC3ukE4JF+O3CxsuPC3/t7Mo+nJFYHdHMz0pRki4SkC54LJnyCduu3WJV2nwjsppIv8rFEYCft51VF4QrdCNvvBlnCe9s73nTWBQ=; 24:h6Gx6hqFItyVwsadgF/3elLMzRWmknwx+8IDoXRnxpVvWIOdczCX2RILdNjN2fmyejl6TSCEcVUjoSUP7vhHAfNi4vNqE6krZzSdyXHj3iU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4445; 7:UDDeMIdFl5/yDg+J4tec9H6ZQbEvuFiJ1SyN/dLNy4G8kRLGOQdQVfhxrbv42bRh9d3RnQlTT8YFydCbppa636Ck7g0fgGZN7YnMcNrKtsB8q5PfEzSClXiFleEikLXY4/GPdcuE3EsKwdhgOqqrHkTmP4RODMsDGUJGHWw0U/cp2OAw/HgvBdXSeI/Liz2LG3fYTBsLooaHPoUJ5ARuOpqMbgBGxB/K4TNBjuuJWxK4wG3Z2Ih3N/M6jFUP9/Wq X-OriginatorOrg: usi.ch X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2018 14:06:32.9056 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: db127c39-e110-4a2d-4a6c-08d5e025048b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 95bdc5ac-afb5-4881-801b-3874f365cd6f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4445 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe05::600 Subject: [Qemu-devel] [PATCH v2] qpci_free_pc: sdhci-test and vhost-user-test could free() NULL pointers. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Emanuele Giuseppe Esposito , qemu-devel@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" server->bus in _test_server_free() could be NULL, since TestServer *dest in test_migrate() was not properly initialized like TestServer *s. Added init_virtio_dev(dest) and uninit_virtio_dev(dest), so the fields are proper= ly set and when test_server_free(dest); is called, they can be correctly freed. Same applies to s->pci.bus, since it is set depending on the architecture. Problem came out once I modified pci-pc.c and pci-pc.h, modifying QPCIBusPC by adding another field before QPCIBus bus. Re-running the tests showed vhost-user-test failing. Signed-off-by: Emanuele Giuseppe Esposito --- tests/libqos/pci-pc.c | 2 ++ tests/sdhci-test.c | 4 +++- tests/vhost-user-test.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c index a7803308b7..c126b08ff5 100644 --- a/tests/libqos/pci-pc.c +++ b/tests/libqos/pci-pc.c @@ -152,6 +152,8 @@ QPCIBus *qpci_init_pc(QTestState *qts, QGuestAllocator = *alloc) =20 void qpci_free_pc(QPCIBus *bus) { + g_assert(bus); + QPCIBusPC *s =3D container_of(bus, QPCIBusPC, bus); =20 g_free(s); diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c index 1d825eb010..9b486b93bf 100644 --- a/tests/sdhci-test.c +++ b/tests/sdhci-test.c @@ -209,7 +209,9 @@ static QSDHCI *machine_start(const struct sdhci_t *test) =20 static void machine_stop(QSDHCI *s) { - qpci_free_pc(s->pci.bus); + if (s->pci.bus) { + qpci_free_pc(s->pci.bus); + } g_free(s->pci.dev); qtest_quit(global_qtest); g_free(s); diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 8ff2106d32..a8a02c45cd 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -684,6 +684,7 @@ static void test_migrate(void) g_free(cmd); =20 init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); + init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC); wait_for_fds(s); size =3D get_log_size(s); g_assert_cmpint(size, =3D=3D, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8)= ); @@ -739,6 +740,7 @@ static void test_migrate(void) read_guest_mem_server(dest); =20 uninit_virtio_dev(s); + uninit_virtio_dev(dest); =20 g_source_destroy(source); g_source_unref(source); --=20 2.17.1