From patchwork Sun Mar 14 23:10:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1452850 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=bushare.onmicrosoft.com header.i=@bushare.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-bushare-onmicrosoft-com header.b=pHvJqtul; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DzFfg57rbz9sPf for ; Mon, 15 Mar 2021 10:11:22 +1100 (AEDT) Received: from localhost ([::1]:53042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLZtG-0008DJ-KT for incoming@patchwork.ozlabs.org; Sun, 14 Mar 2021 19:11:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLZsX-00081U-5k for qemu-devel@nongnu.org; Sun, 14 Mar 2021 19:10:33 -0400 Received: from mail-mw2nam12on2106.outbound.protection.outlook.com ([40.107.244.106]:19297 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLZsV-000342-58 for qemu-devel@nongnu.org; Sun, 14 Mar 2021 19:10:32 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hSSbXFDmIn53PuxjudguKXjurlGamNP8zH7ksWENpMgfc1wXl23eY3VMnfsCOXv7gmIjlU5FPixYiUgeW2SPhpKD4cnPQHRYQHtvkD3LNqwNSRNfyXUDJYo5qunKFamYkCq/Tha405wjQHVrRSe95Iztb/68m1Dy1GLaiv/hxvbqiJsEL/ABxVPZDLGE20lX5fOsr0AEoFnzedTL8fmkrVvbMrcN7/z3vUGSxTjuV2i2N9QqpvByydwvcZiV/Ol1VClX/FuZV20XHHlA7MCYFgI1wyfCam9SoNVc7yc0RPTWmTrg1a98A2ucLvkuJWyFvAUy2+OUIOtJqsHeZ+yBvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aLSisIGtYKl1pNQEx50Kowu2v0RKb2wTjaO1NF9a4O0=; b=YMdESk7Wl1xZoT5SNmmF/TqIAv+aYS9RLlhGCk0bBJZ7MkgPwddt1WVYhm8ZUkspRwM70L+2AbbO7dW+zsrOu1Ey1jHKQOTeMVakq9H9uVXUeO2BwIks0WFiVjOo3+yJHN5VzNfuqNzOVQsHS/Gvz2XyvC25GFYgjorkW0GgTbCiZcPl4XWf3rGFZETUI+oPHDYEvAtyutqUrAQ2VXpkro4ncI8rlHa0gtEHbarF5EHr4cxFoH0ovk+sw5O8Npr4mMOMgfMdG6b1UidDzaKICwMlsjKVbDD8+61+BJlTfYrp82h2/wsz0Nkk42XLoYuTSq/f9ldJR4vRqDXPHjvAiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bu.edu; dmarc=pass action=none header.from=bu.edu; dkim=pass header.d=bu.edu; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bushare.onmicrosoft.com; s=selector2-bushare-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aLSisIGtYKl1pNQEx50Kowu2v0RKb2wTjaO1NF9a4O0=; b=pHvJqtulgzeX0tQci+X4hC/qSvvKCCfjUnkJup5zibfs89E+SejRD4jxnxYU/0wQqRpn8DydBcBXfdw+aD1L00eV1bfhaBNdtzjXFSfXnpyOvPnO5mCt48ZSk5pzZh6I6GjtPqkzcdjxDK8nmj7gJfxj+syaE5SGnhZw/GwvwgE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SN6PR03MB3725.namprd03.prod.outlook.com (2603:10b6:805:43::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Sun, 14 Mar 2021 23:10:27 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::dda8:67d8:8d23:74c6]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::dda8:67d8:8d23:74c6%6]) with mapi id 15.20.3933.032; Sun, 14 Mar 2021 23:10:26 +0000 From: Alexander Bulekov To: qemu-devel@nongnu.org Subject: [PATCH] fuzz: check machine, before PC-specific code Date: Sun, 14 Mar 2021 19:10:15 -0400 Message-Id: <20210314231015.29166-1-alxndr@bu.edu> X-Mailer: git-send-email 2.27.0 X-Originating-IP: [128.197.127.33] X-ClientProxiedBy: MN2PR19CA0011.namprd19.prod.outlook.com (2603:10b6:208:178::24) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from mozz.bu.edu (128.197.127.33) by MN2PR19CA0011.namprd19.prod.outlook.com (2603:10b6:208:178::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.31 via Frontend Transport; Sun, 14 Mar 2021 23:10:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 19ca975c-0307-4306-d1a6-08d8e73e5a6d X-MS-TrafficTypeDiagnostic: SN6PR03MB3725: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:758; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GL/yzXVppVF1zbTXfEaHZ4GkBT5/deaVmz4u+Ayl0KeHFtYJj8/tF9ZMeUrrhczYEoDMgdhohGOVE7cAK67xGc2N44P5KRvJcXMsYkVaAOySzhlRdyLdAlaFFpbUOkFzQ1Xbhtq4OPli3oi032NdKgkQK/aY9Lh9M5jeuLg0ojtX1/8XXn7a7pJ11bEsJ/AneCFcUuYkoXBVRkwjbhOJqlj8sdOgpoFO0uyszjJPao3MXcpUqi7BopkyGQxFcJP4IU/lZJ3fJChrsYxopArdpgq4Zr49NJeDbOOVMqApriU7owsl7/hYDrRr/2rriU/cIA9/SyD6rDC7bLN3Er2SCkUz2vMzIiz2PoOSf/AqgUxfuZwUZ5ut0+06pbO9zKePkUb8JUqA25d46nAothvYX6Z1bDRSCwQT4Sa4vzma6KhyBq3O+y+wTP+9L20f9ebhLHco3Kt8jFWXuDri+zOLT1s12omgKmsqoXjxwF1N47D1yxBklv5rBMl+LDuzJdvVBuL9vjbzXNAvVE2ixQLLHA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR03MB3871.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(39860400002)(346002)(136003)(366004)(376002)(956004)(186003)(2906002)(478600001)(2616005)(8936002)(52116002)(5660300002)(316002)(7696005)(786003)(6486002)(6916009)(75432002)(86362001)(6666004)(4326008)(1076003)(36756003)(8676002)(66476007)(54906003)(66946007)(16526019)(26005)(83380400001)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?6SYsAkrqD/rdVEusQXhqMQhpiJC+FW?= =?utf-8?q?tIg/49ObNWFSOqAXF6AmOqc+R/GJ5PY/l6HoegiZmgskQLI2lcSo+jmuIJlCj3V5u?= =?utf-8?q?9rVXsImpb38pX5V92/bPVgFG7jSs3o+xCOaYBMv1zJbPXTSug/ROiLObxRPHqekCw?= =?utf-8?q?ZBzHqyh35D+mZDHs5bPBezqKhC5s1qfKzNuatWNLyjD4ekYZILa53UMz+ORZySLnG?= =?utf-8?q?dUZSkC1xQ8kJ32fkxoudw5SohgefAqPWLrJTeXPs5vKEdnxMWClsqjW6N9oJ8gEiS?= =?utf-8?q?K52DRTl0n0D99iBYWuZs7Af73k/w4W2t1WtE/8k+iDpfOmhmJXLFNnEUquwFuR7hs?= =?utf-8?q?LKIA0xqlBwkWPxeRHb7ChFM4FUbjAEJqYS5Rrv2EF1K3RtX+aofJpW6LnfP3XSSqi?= =?utf-8?q?zdgOU0wwkJ+K57FjNtpPB8W7HvQIpLtbl4NASiXWtslqqtYOINNuNdJdpCzi7I1DJ?= =?utf-8?q?vNmY2jZ7El5JRPVomVV7fQBoS4rMIcsmx4ClcI4fcyj5xyrXrmDqdccCcQlO9SeGm?= =?utf-8?q?OdgwQQ7taMOGyl8j3Wq7+b+dR+A71Am7VW72Snk0IxpuPh4kH9em3V8c4xaOgitRs?= =?utf-8?q?QMDWQhIkhYIb6xzXuQb5mu8aYsDOtE6QAttqXeNQRuDU5PNyW9Rtfwx9bLV5g8lfw?= =?utf-8?q?DpG7ui/lQZIFyVlr+rzBOam35g9MLBMeazHVd1MLALuayqDHVCn+5FsRVIxyZomDW?= =?utf-8?q?92lnytzsUZHqVf00JtSI2JLhVMiA4Ra3xy8hja6cIr1plyNI5AZeYvdw3ItwvmJnB?= =?utf-8?q?DKNGkDNTthNMFfM9ThYL3MR+Q47CXvUxdTMYIpqRW3xhCkHtvmmqMI5TpnkQZxMDN?= =?utf-8?q?3i6Svsq/uMZB2IcFL6z0zm2k2Y9ABl75vh6SsDug1hTeUDXv2J0bzXmjpAR+OBvbt?= =?utf-8?q?PS6w1LtDEDIz66i+vc69LEEAXPzuJ4UEuO7oBKHEkgMbrj3Qx2OLfNSi5w0Mcs+Qn?= =?utf-8?q?7ewCqOg0BPKDgnobvdl+ae5XinhNAyjDjKvLj9I0JTu3BvLbFRwh95Kq0zJ50HsxV?= =?utf-8?q?Yz9aSNHK4OSkJQCbAm9u2C9oSgn1rYRR5bG7pu8EtD4upyh1yx4EasUm6MDkK1WUb?= =?utf-8?q?GkxqMhrQr0HEocp2VqwoWkRLL7RvA9p6N25MiFyuv1vwaBZ+dNWP8yoVSVdOCANuk?= =?utf-8?q?rHg5De4D5vR2Dmq2ZMqFlOz8ZzpPxGilEoEGn9xmGFN11xJy0HlwySpFZUsvUjx2A?= =?utf-8?q?FoKnXkQeOqKoBOzNzgMgu0IOCxkpuYydXjSGg6dqIlJ+EBpzz7qAyl/CwKabVbDS+?= =?utf-8?q?gbwsXJgOMEz9RM?= X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 19ca975c-0307-4306-d1a6-08d8e73e5a6d X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2021 23:10:26.6538 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d57d32cc-c121-488f-b07b-dfe705680c71 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JqZsuP2P910YxO9ZjDiwUGQlhgm2iimhmHTtmLfT2aoz6rzFbzEgmdc1HT7Qfd/C X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB3725 Received-SPF: pass client-ip=40.107.244.106; envelope-from=alxndr@bu.edu; helo=NAM12-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.999, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Alexander Bulekov , f4bug@amsat.org, darren.kenny@oracle.com, Bandan Das , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We enumerate PCI devices on PC machines, but this breaks the fuzzer for non-PC machines and architectures. Add checks to avoid this. Reported-by: Philippe Mathieu-Daudé Signed-off-by: Alexander Bulekov --- tests/qtest/fuzz/generic_fuzz.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index ee8c17a04c..d2b74028fe 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -784,6 +784,7 @@ static void generic_pre_fuzz(QTestState *s) MemoryRegion *mr; QPCIBus *pcibus; char **result; + const char* machine_type; if (!getenv("QEMU_FUZZ_OBJECTS")) { usage(); @@ -827,9 +828,13 @@ static void generic_pre_fuzz(QTestState *s) exit(1); } - pcibus = qpci_new_pc(s, NULL); - g_ptr_array_foreach(fuzzable_pci_devices, pci_enum, pcibus); - qpci_free_pc(pcibus); + machine_type = object_get_typename(qdev_get_machine()); + if(fuzzable_pci_devices->len && strstr(machine_type, "pc") == machine_type) + { + pcibus = qpci_new_pc(s, NULL); + g_ptr_array_foreach(fuzzable_pci_devices, pci_enum, pcibus); + qpci_free_pc(pcibus); + } counter_shm_init(); }