From patchwork Mon Jan 25 18:47:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1431333 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=vAp22tNQ; 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 4DPf8x54Gbz9sCD for ; Tue, 26 Jan 2021 05:51:29 +1100 (AEDT) Received: from localhost ([::1]:46068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l46xT-0006Bc-B2 for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 13:51:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46uU-0004EO-Td for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:23 -0500 Received: from mail-bn8nam12on2112.outbound.protection.outlook.com ([40.107.237.112]:16865 helo=NAM12-BN8-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 1l46uQ-0004xv-Pb for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:22 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IShODqEENuH9+JbiCYwA9Rj/0daN86TqPV85g85DDNRsDXF3QSuZlxZdWzQYhUylt0bwHfdJNIEZqI8/5Em5BTsJVxsib7JQ7wDot0Xmer67k0HFM0FQdRz+Z1R6Z6dewffY1xJ34rquOVQkTOQ+wyRSwkYkgDBYBmQGWrpLJ+N3TKSOn8piW1u0O8qyXpm8TLGMZy/we2rG7SmxnIPyex/SJ3p9vxUTG3OoV94zSiuupt9ezXafQn2GUTvYISYbXzCZPwRehunD+KXd2Mz20g2WWYAGOlt0DupAvf1mfjHdFtDVd+FeFkejtxq4XQbSHCW/BmwUaahJIoBvjFGDdw== 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=petbwEObRAR1urMSeuoTNxR2PSGFo5D944iv8A6AaHM=; b=jK+TgvuVe2ctf60FmGGVdKKaTxTzRbWpdA4q4+jv7vojunhuVoDSWRmH4JTy3OCBcZrmA2FOGku62xIvmvuNRX8PQDAc8Ksb/OSbcOIUujOJXsQgITUzg+A+xhqjIhhupQzjxTMJ7m8f4eH0i6ImZxuq3WP9p9lV2ZaBM9wD5XW49OwkCX7Eov4Mg98KHsM+WRHQhGKb3dTKAs9M3xCzllngevHEG5rx1VpnCA637QKfliALxfMpqkMjWFVx/EHH5CkPpGaSyUlmHvYRUDR3iitTj8rE7NrSlf1yH4hVG2WXbl0Y7+1Nek8CPLrITukCZDddCWuLov7tVcDeZFtrzQ== 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=petbwEObRAR1urMSeuoTNxR2PSGFo5D944iv8A6AaHM=; b=vAp22tNQHNmOPRtWu7GBalxnBZcb1HcPqL2rVDJY/SfIN9Vl8l2IA77yhywjkOKD0S440WGW6XvaRlJgR47WeHV1JuHmOiwSrc9WJl5hVr3Vp9skCgZi/beBwEKdNJJ95VW4a0hbDikM3NzvbnG4SOlreAdlcuybnzX1aGH3Iko= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5563.namprd03.prod.outlook.com (2603:10b6:806:b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 18:48:09 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310%6]) with mapi id 15.20.3784.015; Mon, 25 Jan 2021 18:48:09 +0000 From: Alexander Bulekov To: pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [RESEND PULL 1/7] fuzz: ignore address_space_map is_write flag Date: Mon, 25 Jan 2021 13:47:50 -0500 Message-Id: <20210125184756.319453-2-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125184756.319453-1-alxndr@bu.edu> References: <20210125184756.319453-1-alxndr@bu.edu> X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Mon, 25 Jan 2021 18:48:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a34eb5d-de6c-4de6-e16e-08d8c161c259 X-MS-TrafficTypeDiagnostic: SA0PR03MB5563: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wmSG9wHd4ut7CFopHK8F9TCnhWsUEqMwGXSIaAWQ9fcLuY0NRED+gzgcjHfRyTH2eP6FDtGJpEx7OdWbAscCO8Sz/zT7dnbNaJsFqrxEoGXtHSLfOcReggDnTR/QeNDfXo3jXDX2o3ODmXVGmHnQVLqDlYaD7/xvrj1fgQIPcI4hFPiDCt9Bcpq4XGptTlchC4iMdPS9a1hLqF/zdywauy1kCGpj8Nz2CJ0hswNllDZkiODRVW2D925LG8eChE5hIUUhddOfqerY5Aia/XIfy7CdOqWbfbPMiyYm802j95E8+8njNmnvMQ/nzzAsNhFL7NmJ3qb+0qulBF+m6Wz3wM8S3wehIZ88UoyE6UgtGE2jx0iFrw9r12lD6hTjGjZpft9ydWfdlPxPkDMz3kxUCNp5p3UDWm6qZueOfhDLP3bMrDKjOWMBwBKa5dWstt3EuSIE67cIBfhzztAH9ZQAcQ== 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)(346002)(376002)(39860400002)(136003)(366004)(1076003)(75432002)(478600001)(6666004)(956004)(786003)(86362001)(52116002)(2616005)(54906003)(2906002)(316002)(83380400001)(966005)(8936002)(36756003)(66946007)(6512007)(6486002)(16526019)(186003)(66556008)(8676002)(26005)(4326008)(66476007)(5660300002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 7Nae/zyhJQlavjjzAhUxHmCpvV4nyGNJucRVDBblekSSL7lcKnYQInbH57o17Oy8f39YVkabWDsCS6B5u5PXLvYBOexzSH+Ru3xTveg1XDn0fMlzW+ILaKk3HtKsaVqJowVskqK8Kogf/ELT0UQ3z8MDiUz5AiMu8kDxsEsOTTlwITVloa1eL9gWYsgZRI50KCtDYrU2CAk4tRzTyEsvZofyN9zTjlgCK9EPxdKsSFny9Ndah9CVV18UXjv91mYzU8RKQsBsHRwPR+3aeefrviD0Fqj0W4q1AqMe6TC4gMRbnTjO+iHqNOVOoG/wLEjHNbCs1uaL0Lry1WgvqhQemd7+cZCbneyO2R+X9niQJhAKkl+s8gNnwD/pj/4ldbmnKXSbmS71xXCYgRmNr4+XD1qddYtLxKBUCLdCnPqdJbQ0gd2Kiqstye/G44IYLPIrqlrwB5Jgo+0dkUxxp2wAIiUYRtyxP9xbQPkErb4HQD7Q6hSciD5DJS84jkfAO7E53Vh9yGtDhlCDUEV3mw37A6mowA0f5/BaziYccM3CAQeqIkUWSK+EPG2rg1BUfCnsJtH7lFdCy239L+1GMRC6dI0ze9KmQK1Pz69ZeoZ7xTVCf5TWauApTvieQnQPJAZkWqEnAXoQTDEvZg2pMEhPKHoWT6sNsNeh12Ci3pzc9xgbPRHDFYRou4RxtenpfAX/Kqw96zPC96jdMLgyLtqAmn3SF4gWMzmKp6Rja+BKmsltogAvMOampt6g/XW1LfVqQDLU70JwcI9jfiwBy5QAWg4kh6Jbgo8IylZu97bFy+7k6arYwOjuLdv8tI8lURbo0RKmMMpXf7jaddv0PUdv/zyiHFr2hTVzdOfn3mdt791u1BCTTg/IAlVC8e/cOrF9pgCDQK8RpROqcx9usGSn45X6uLGJyjvREe8oX4FzJUrccz8I8G6UYFLkPaAcMDxywsWQ5sazfawXGGcqax9zG8M14otGfJTDC/2O0Tpe4OmYyjiDMQxFN8PRmKOP419kvxFBuDZ/MsfxO8eLc/QrDSpbk5IO9cXGE9Ar+FdxwZYASP4SQAQf0qAd5jIOPkUu X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 0a34eb5d-de6c-4de6-e16e-08d8c161c259 X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 18:48:09.3671 (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: XM+l7ovcYRDTeVK0n50pUdCssVs6wXYh0kOcjLp3AlXf94Ov4/J5QX1o1HzmOTss X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5563 Received-SPF: pass client-ip=40.107.237.112; envelope-from=alxndr@bu.edu; helo=NAM12-BN8-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: Alexander Bulekov , Thomas Huth , philmd@redhat.com, Darren Kenny , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We passed an is_write flag to the fuzz_dma_read_cb function to differentiate between the mapped DMA regions that need to be populated with fuzzed data, and those that don't. We simply passed through the address_space_map is_write parameter. The goal was to cut down on unnecessarily populating mapped DMA regions, when they are not read from. Unfortunately, nothing precludes code from reading from regions mapped with is_write=true. For example, see: https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg04729.html This patch removes the is_write parameter to fuzz_dma_read_cb. As a result, we will fill all mapped DMA regions with fuzzed data, ignoring the specified transfer direction. Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny Message-Id: <20210120060255.558535-1-alxndr@bu.edu> --- include/exec/memory.h | 8 +++----- include/exec/memory_ldst_cached.h.inc | 6 +++--- memory_ldst.c.inc | 8 ++++---- softmmu/memory.c | 5 ++--- softmmu/physmem.c | 4 ++-- tests/qtest/fuzz/generic_fuzz.c | 9 +++------ 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 521d9901d7..0f89787de2 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -45,13 +45,11 @@ DECLARE_OBJ_CHECKERS(IOMMUMemoryRegion, IOMMUMemoryRegionClass, #ifdef CONFIG_FUZZ void fuzz_dma_read_cb(size_t addr, size_t len, - MemoryRegion *mr, - bool is_write); + MemoryRegion *mr); #else static inline void fuzz_dma_read_cb(size_t addr, size_t len, - MemoryRegion *mr, - bool is_write) + MemoryRegion *mr) { /* Do Nothing */ } @@ -2504,7 +2502,7 @@ address_space_read_cached(MemoryRegionCache *cache, hwaddr addr, void *buf, hwaddr len) { assert(addr < cache->len && len <= cache->len - addr); - fuzz_dma_read_cb(cache->xlat + addr, len, cache->mrs.mr, false); + fuzz_dma_read_cb(cache->xlat + addr, len, cache->mrs.mr); if (likely(cache->ptr)) { memcpy(buf, cache->ptr + addr, len); return MEMTX_OK; diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ldst_cached.h.inc index 01efad62de..7bc8790d34 100644 --- a/include/exec/memory_ldst_cached.h.inc +++ b/include/exec/memory_ldst_cached.h.inc @@ -28,7 +28,7 @@ static inline uint32_t ADDRESS_SPACE_LD_CACHED(l)(MemoryRegionCache *cache, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len && 4 <= cache->len - addr); - fuzz_dma_read_cb(cache->xlat + addr, 4, cache->mrs.mr, false); + fuzz_dma_read_cb(cache->xlat + addr, 4, cache->mrs.mr); if (likely(cache->ptr)) { return LD_P(l)(cache->ptr + addr); } else { @@ -40,7 +40,7 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(MemoryRegionCache *cache, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len && 8 <= cache->len - addr); - fuzz_dma_read_cb(cache->xlat + addr, 8, cache->mrs.mr, false); + fuzz_dma_read_cb(cache->xlat + addr, 8, cache->mrs.mr); if (likely(cache->ptr)) { return LD_P(q)(cache->ptr + addr); } else { @@ -52,7 +52,7 @@ static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len && 2 <= cache->len - addr); - fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr, false); + fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr); if (likely(cache->ptr)) { return LD_P(uw)(cache->ptr + addr); } else { diff --git a/memory_ldst.c.inc b/memory_ldst.c.inc index 2fed2de18e..b56e961967 100644 --- a/memory_ldst.c.inc +++ b/memory_ldst.c.inc @@ -42,7 +42,7 @@ static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL, MO_32 | devend_memop(endian), attrs); } else { /* RAM case */ - fuzz_dma_read_cb(addr, 4, mr, false); + fuzz_dma_read_cb(addr, 4, mr); ptr = qemu_map_ram_ptr(mr->ram_block, addr1); switch (endian) { case DEVICE_LITTLE_ENDIAN: @@ -111,7 +111,7 @@ static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL, MO_64 | devend_memop(endian), attrs); } else { /* RAM case */ - fuzz_dma_read_cb(addr, 8, mr, false); + fuzz_dma_read_cb(addr, 8, mr); ptr = qemu_map_ram_ptr(mr->ram_block, addr1); switch (endian) { case DEVICE_LITTLE_ENDIAN: @@ -177,7 +177,7 @@ uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, r = memory_region_dispatch_read(mr, addr1, &val, MO_8, attrs); } else { /* RAM case */ - fuzz_dma_read_cb(addr, 1, mr, false); + fuzz_dma_read_cb(addr, 1, mr); ptr = qemu_map_ram_ptr(mr->ram_block, addr1); val = ldub_p(ptr); r = MEMTX_OK; @@ -215,7 +215,7 @@ static inline uint32_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, MO_16 | devend_memop(endian), attrs); } else { /* RAM case */ - fuzz_dma_read_cb(addr, 2, mr, false); + fuzz_dma_read_cb(addr, 2, mr); ptr = qemu_map_ram_ptr(mr->ram_block, addr1); switch (endian) { case DEVICE_LITTLE_ENDIAN: diff --git a/softmmu/memory.c b/softmmu/memory.c index 333e1ed7b0..4fc0071dcd 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1440,7 +1440,7 @@ MemTxResult memory_region_dispatch_read(MemoryRegion *mr, unsigned size = memop_size(op); MemTxResult r; - fuzz_dma_read_cb(addr, size, mr, false); + fuzz_dma_read_cb(addr, size, mr); if (!memory_region_access_valid(mr, addr, size, false, attrs)) { *pval = unassigned_mem_read(mr, addr, size); return MEMTX_DECODE_ERROR; @@ -3282,8 +3282,7 @@ void memory_region_init_rom_device(MemoryRegion *mr, #ifdef CONFIG_FUZZ void __attribute__((weak)) fuzz_dma_read_cb(size_t addr, size_t len, - MemoryRegion *mr, - bool is_write) + MemoryRegion *mr) { } #endif diff --git a/softmmu/physmem.c b/softmmu/physmem.c index cdcd197656..f31e545b8b 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2824,7 +2824,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, stn_he_p(buf, l, val); } else { /* RAM case */ - fuzz_dma_read_cb(addr, len, mr, false); + fuzz_dma_read_cb(addr, len, mr); ram_ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); memcpy(buf, ram_ptr, l); } @@ -3185,7 +3185,7 @@ void *address_space_map(AddressSpace *as, memory_region_ref(mr); *plen = flatview_extend_translation(fv, addr, len, mr, xlat, l, is_write, attrs); - fuzz_dma_read_cb(addr, *plen, mr, is_write); + fuzz_dma_read_cb(addr, *plen, mr); ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true); return ptr; diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index be76d47d2d..deb74f15be 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -175,7 +175,7 @@ static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr) * generic_fuzz(), avoiding potential race-conditions, which we don't have * a good way for reproducing right now. */ -void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool is_write) +void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr) { /* Are we in the generic-fuzzer or are we using another fuzz-target? */ if (!qts_global) { @@ -187,14 +187,11 @@ void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool is_write) * - We have no DMA patterns defined * - The length of the DMA read request is zero * - The DMA read is hitting an MR other than the machine's main RAM - * - The DMA request is not a read (what happens for a address_space_map - * with is_write=True? Can the device use the same pointer to do reads?) * - The DMA request hits past the bounds of our RAM */ if (dma_patterns->len == 0 || len == 0 || mr != current_machine->ram - || is_write || addr > current_machine->ram_size) { return; } @@ -213,12 +210,12 @@ void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool is_write) double_fetch = true; if (addr < region.addr && avoid_double_fetches) { - fuzz_dma_read_cb(addr, region.addr - addr, mr, is_write); + fuzz_dma_read_cb(addr, region.addr - addr, mr); } if (addr + len > region.addr + region.size && avoid_double_fetches) { fuzz_dma_read_cb(region.addr + region.size, - addr + len - (region.addr + region.size), mr, is_write); + addr + len - (region.addr + region.size), mr); } return; } From patchwork Mon Jan 25 18:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1431332 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=V/wt/x5j; 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 4DPf7Q2sXVz9sCD for ; Tue, 26 Jan 2021 05:50:10 +1100 (AEDT) Received: from localhost ([::1]:41764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l46wC-0004I6-7Y for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 13:50:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46uX-0004Ey-4W for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:25 -0500 Received: from mail-bn8nam12on2112.outbound.protection.outlook.com ([40.107.237.112]:16865 helo=NAM12-BN8-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 1l46uV-0004xv-M2 for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:24 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SW1CFU/EDMngXNFQ+kpNSzSGz7dFEkvwu9eGz7U7T/FeMVUS5TfWF6fA5AzTOIs/b4LfVVg1yXjo+OQNlVF6ep1UPzOUHGtR0ISfZkBSyk+ixw67Mh/2JIklGB+aLAKi5y486863XaFY2030prXaMOhP+X0X+iL2jqaz2mKcjka2SNHr8SYJeOWJxf+okYQ79WZIwdVhq67eTgq8ggWIQq0GpdI+6FHlKG6vd5oXpUbxYmOR7cvu4FvMzOnDyjl2/hGf8gV6kN4/OOyfcj1362s9XUgsR99Vchp1iv+eDrCB11cEqLA8BvDiEs/QijRvbN912jb06qv74RrsoawQng== 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=Xq2p/RNTQpSd3P8NmqBUsX7G9fUXjFpdSo91qJtUlkE=; b=g+Ha15k8oZQp/gvcFXjAVq9qudUerxnxQp3yVHCVT0AxF6YXwRQrWGtH9J7DMnMm3cncGdCSwDe3b2z9KKFZuVYAZqH0t3n1qkxo1be4ip+0J3XkJsexJ4SuNbIkkV+uwyqP+Z9NKv1ahesZ+yd2VlhnYrxvz/MGqJtiisBgIrwAXolEJ5TGr0ynl21k5Sj73MJGSFnAYDDOuoJHejgvsByjnerjp/vsx2SyohhDkp8zQiUbf6Kr0+1G0WPdlsRyf+ebQrUP7d7CCBN+XtVokKZFhQFpWVME0fT//PVEyDR33lqpZEZvp6/3Iut9nyLJSV7FhJ9sBGwuEV4bEFXUpQ== 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=Xq2p/RNTQpSd3P8NmqBUsX7G9fUXjFpdSo91qJtUlkE=; b=V/wt/x5j5wA3ecbYOiGpmArEeSD/jujxL29k4B6LpCSw2iWXI4p7UUKySSk59OZ+WVlSEv4LBhktroCk7yUaUn32WIguAgrDLItoTGHwEF6xqgHajUxvZxBqKkAwizgh21aVkGR2vpskH6SDAZmNUgiEoev1gaWEQ6Cqcf1MLAM= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5563.namprd03.prod.outlook.com (2603:10b6:806:b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 18:48:10 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310%6]) with mapi id 15.20.3784.015; Mon, 25 Jan 2021 18:48:10 +0000 From: Alexander Bulekov To: pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [RESEND PULL 2/7] fuzz: refine the ide/ahci fuzzer configs Date: Mon, 25 Jan 2021 13:47:51 -0500 Message-Id: <20210125184756.319453-3-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125184756.319453-1-alxndr@bu.edu> References: <20210125184756.319453-1-alxndr@bu.edu> X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Mon, 25 Jan 2021 18:48:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9b1056c5-cef7-4650-5ead-08d8c161c31f X-MS-TrafficTypeDiagnostic: SA0PR03MB5563: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n6KWaT5k9E8FFbHq+tIUAniCWsBj9ShsNQujcCPNF5/I/ZpgFBplnlZrLPYLuaDLJr0sK8Kne/wOz1Ai3fXk4x1HzlX+z/3f/5c94hLnhPm233oRNWGU9cuseKdAWrtGCZ+7hynW8fDqfMLfjIa9jgA8i4n/oDzw4tNmbf+w9W4OWX0gC7bI5nWv3mqV5N+x5H4H6FbrhxWouOpaSTmPqC/6WEykVB+ZZEm0u+gOPSe8Dte0EIG4F6XFxlohwqutN76ortLq0PS5P1tVMZLG+Z2CaDMjz0sh9UxjlNb4l+JStKotgfyxXHvzDRWzCq0KVBizQQj7+0JU/+oMjfSMXBgaifokXrufBmD44CVrle7Wnx0LIPapPESC4RlF06CC5SyrZjX1nN64pvxbpTUF/w== 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)(346002)(376002)(39860400002)(136003)(366004)(1076003)(75432002)(478600001)(6666004)(956004)(786003)(86362001)(52116002)(2616005)(54906003)(2906002)(316002)(83380400001)(8936002)(36756003)(66946007)(6512007)(6486002)(16526019)(186003)(66556008)(8676002)(26005)(4326008)(66476007)(5660300002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: rJl96MZttCGUcjgIJFjyRXFkTu7W1vbOXESR2fzOXTeC6LMSuJ7IcpTjHpgdHA1g5Kc3/7FzkjoJa8roEl7HLtHIcrK3+8WxvCI0CpRQeLtVKvO6+UMW6IYG5xi+S7GsgilPXGzbJTttDnIrM8hBPmHEev75vkjm3NYwSLghvKXeYU2ZNSGRaPMyIH/NrY+5xLmv4Ppi79PSCl8okG5gc9EmfnuSa79BFoHIsTIhEc97B3ebnhTTX27+nTPT/7m6wmOwjOdT16gaLOucMFTTRUZqzQaqGG/dj5fdwAbEiUVX+5cwlYTiowS2FSJkBCAUnGgEe2yUugQrARVL8oZlG76UEIIGGJWnya9eYJhYLDb168TGAVm1bh48dPeiXD06qhmVUVKmLkIn+pRTXAHrA5P6tcZ9YkE8iP/9XCF3uhuKN466jpYsRWDDSpptlh8J7SqQhzL1UprwwQp2kWWz+Npo5EQN8oicG1C6OVgsgsLp0Qx19s5TLtwz2qm0mO4INyBj/PH4NmgBEiWAslAWnI30tdjsMaR4wkaHXDtUkSQLG+fjJGKbwf5fPHdNzsCk418DHz6MdSNQGuimxyARUoxd+DIhGx61+spe857Jgbnd9bezrtTZqfy4a4L70rOz4gyN3yNiBJUY6glqQm3XP3XyDyRLZhi/qSdY/XFFpFS+M8DYNCSN1cxob1Boe6YdZUJhHfsM3GjdDcgHS+blxLG8wrbWkROoSptK2f+mg5paW2X8ZJf/58VnLCihLcWURp7//Pd1NPSYWtnPALK5OfqPGqI64Yn39YMIFBqB4xmeZKCebkJ2khL0AvT/oBm9qh29omLV5v4j87Eg32CDbBVGU0DWiUe6ULeMx8W9B7oDGP4bnvdC65G2MQYWzbYdtM4lq+rcoJ3MQrugk1bMLrU1NemSGEueERuFXwBAmWB0zwLQQxlXZ497dn0EaOr4iuKrbw35CSeyO7oThYul88RCfazVtXLYPbdlRSwHXZEX1dbCY3QMdcK8yVfdxwuvM0MxCfDsMUPvONfrn7NVW9MZDmyE3SdY0aXcqWlvJp/UzO8CuaUVqJPPKzGYhvla X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 9b1056c5-cef7-4650-5ead-08d8c161c31f X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 18:48:10.3715 (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: H3st867CuSFN46jQbqvHfHEk4Sjq8s16XmarmFTTlOSkHvhfm3n2YdiAWwO1CwPT X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5563 Received-SPF: pass client-ip=40.107.237.112; envelope-from=alxndr@bu.edu; helo=NAM12-BN8-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: Alexander Bulekov , Thomas Huth , philmd@redhat.com, Darren Kenny , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Disks work differently depending on the x86 machine type (SATA vs PATA). Additionally, we should fuzz the atapi code paths, which might contain vulnerabilities such as CVE-2020-29443. This patch adds hard-disk and cdrom generic-fuzzer configs for both the pc (PATA) and q35 (SATA) machine types. Signed-off-by: Alexander Bulekov Acked-by: Thomas Huth Reviewed-by: Darren Kenny Message-Id: <20210120152211.109782-1-alxndr@bu.edu> --- tests/qtest/fuzz/generic_fuzz_configs.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/generic_fuzz_configs.h index 7fed035345..aa4c03f1ae 100644 --- a/tests/qtest/fuzz/generic_fuzz_configs.h +++ b/tests/qtest/fuzz/generic_fuzz_configs.h @@ -85,10 +85,28 @@ const generic_fuzz_config predefined_configs[] = { .objects = "intel-hda", },{ .name = "ide-hd", + .args = "-machine pc -nodefaults " + "-drive file=null-co://,if=none,format=raw,id=disk0 " + "-device ide-hd,drive=disk0", + .objects = "*ide*", + },{ + .name = "ide-atapi", + .args = "-machine pc -nodefaults " + "-drive file=null-co://,if=none,format=raw,id=disk0 " + "-device ide-cd,drive=disk0", + .objects = "*ide*", + },{ + .name = "ahci-hd", .args = "-machine q35 -nodefaults " "-drive file=null-co://,if=none,format=raw,id=disk0 " "-device ide-hd,drive=disk0", - .objects = "ahci*", + .objects = "*ahci*", + },{ + .name = "ahci-atapi", + .args = "-machine q35 -nodefaults " + "-drive file=null-co://,if=none,format=raw,id=disk0 " + "-device ide-cd,drive=disk0", + .objects = "*ahci*", },{ .name = "floppy", .args = "-machine pc -nodefaults -device floppy,id=floppy0 " From patchwork Mon Jan 25 18:47:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1431334 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=Mh2/3X1c; 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 4DPfBW1RWBz9sCD for ; Tue, 26 Jan 2021 05:52:50 +1100 (AEDT) Received: from localhost ([::1]:50330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l46ym-00089u-QY for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 13:52:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46uY-0004Gv-Qi for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:26 -0500 Received: from mail-bn8nam12on2112.outbound.protection.outlook.com ([40.107.237.112]:16865 helo=NAM12-BN8-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 1l46uX-0004xv-Br for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:26 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PQlb3D1/IWxJzR71oPRVHBCTVcJ7QCB5v/DOpRI/mscRIP4KKRX4MTufq8+Ddbtx7fr+cXK4e7B4C9dBHmUZwcKuozc9qa8D4nrTGHEa2+biRoZptkVfwpmU54pnaDR06fidSnO+rKIpL4LZdb9eu3lOEYT+83aQ6gBIXvN4xygAXvRxNCQDHwivlRyuOf8FD3wryD7wddO4zBg8v03v2R2X9yUsSkjRjX0/5kXNenpaALd9INcp7wfPqfTMuNPKaGhtk/dGTbZDOQ6UebOIXi/8LmVfrhCDQsOEf7S5umMjUjC7kIBQa9KEY9R5k5fkT9YHLRVuQaasm/6ZOdJALQ== 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=nKhZzirZlY5afJ3k8Rr3cJRwlVVQsq5KvAELkjj9Mwg=; b=WeKTi0mtpd0GDRC/QBQK2k//yKAIW3w06tU6jVELIvaobieeC3GLRowaQ+nYGH5F6ZU8m0JWa+V0r24CKdI0Mw7xK5SjPHC2r3ZWjHPhw65C1XkYI09bbzHMFIU3yO3iN0dVHA3worJcdZVaTgBO2RvLJjhFqSWJlugopfa02f7w13St5GjZ1o3rNPF035vvC+ykd22EDcS8O31YNr4RYN5NqKhwpewuY0Qha9IBCQeDlpgS4fdiBAA4P0iiWxxh1cR2R0/HJhlyBFJ3+MtSVANg6rKLb5joa4tWwoK6D5hy/UU5ygSE2R+da+RLXq37AW2eoAxgB68c2VHkWSOxQw== 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=nKhZzirZlY5afJ3k8Rr3cJRwlVVQsq5KvAELkjj9Mwg=; b=Mh2/3X1cjYdJthgzWYsGnq8m7LK7JTInAPEyUGXOnvWoAKO9G0U8xN58JeZPJ89jBCW+DbwPjTlphSWkV1nqc1inSnJCCl/LYvlWEKndWTi8P0o/pvW8mIaPI5WOL+Emb9dRYUW/1mE7XOamp6BcXaQktStIKPoB9SvWDEhY04E= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5563.namprd03.prod.outlook.com (2603:10b6:806:b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 18:48:11 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310%6]) with mapi id 15.20.3784.015; Mon, 25 Jan 2021 18:48:11 +0000 From: Alexander Bulekov To: pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [RESEND PULL 3/7] docs/fuzz: fix pre-meson path Date: Mon, 25 Jan 2021 13:47:52 -0500 Message-Id: <20210125184756.319453-4-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125184756.319453-1-alxndr@bu.edu> References: <20210125184756.319453-1-alxndr@bu.edu> X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Mon, 25 Jan 2021 18:48:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a9436d8-edf0-431a-59cd-08d8c161c3a4 X-MS-TrafficTypeDiagnostic: SA0PR03MB5563: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cUZn8yurJDxGwR6xC79pmNR7fDO3CXqOZQm/TY80HrDXDhvcfus5EwGEpqCBw9m/sN7HSAyzbye3sUAFCcOrQrRRxZHU/yEz3sqGC9FZZIffgeHmMw/LwDfgL5AA1ZMc9MXo4D6zEFGdNRLf0LE7cQEIWI/4YrPMYztoSJbBaIuU1VL9fkYCYChKO+/HGubvm0aqZG2o/Ucv4TGcgUvjk7akEkEUAhQGeJ1xC5YXfrdaaf/cdJ3ultD8/IeF79XNmv+OoWE6kr4J+mvEjHX0Ql6JZQrB5DGyS0VXMi78h1Z13EVubxDHcFTOC2VD/gHRsLc7ZTSas7MBYKbx74V7FyCgYSYGB4XcSsP/bEBq/1+xT3zkWxaaloXodvFrTCqHS2jTPdS6cGvKX6Ed2oKp0Q== 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)(346002)(376002)(39860400002)(136003)(366004)(1076003)(75432002)(478600001)(6666004)(956004)(786003)(86362001)(52116002)(2616005)(54906003)(2906002)(316002)(83380400001)(8936002)(36756003)(66946007)(6512007)(6486002)(16526019)(186003)(66556008)(8676002)(26005)(4326008)(66476007)(5660300002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: BrY+hKIbSuP1983ugkGkfMkr0xX+YCwUETuQ9Mwcc1bUCwv6qzjXHpOBDY8BrQwesdqNE70wIffuoD0QCNpOe2y4bJLVPo2ubFU1KPfJ2ybUpBiqKTmEfEScWvsScAEjEHIWehnonp9zHQbdUxpseSnyRnqy+yp40YtZpE5P1JVm2v2QFSdQlQMfR00got8QJt2uxBvB9h1SqFeRzVQsZzj5C6fCUMGpdeEO2kvh4ysl1hXaCDEpWXI1Xs5YPf+KQzx0/fRsF0TVixGEj0j4w6RiW1XNPqU82iCC/7+uEe5JizAMUJqLfofWUF3JBtj0eCWwoQqRT4IZl3nvsrwMS2mT+3SIoo3QSBHxGqK8tOZaP3KtSAQWHKrEy5AWQAslpLXLVJhMBqlUyzKe4599o/BtDFU7wB/ch8sFpcc37IWBy5xuTSDgEKx5uKErZLCntRcEHCHPj1f4QRMC+16fW0UlHv+0OEcJRe9s1rXzFDpTieudsxzd6PLmLTe11yRTE58z46rl3Hn48j+I2FObUNEcNKzFE5pFrhMj4azFp7L5SUtyyKpVCyN/YEoteMeUc3xkP1dZc5jytmz40zxLE1gUO+ziRH1LQ/p1UT7LTWntgNI5NjbTPuuLLM6ldSuA+EstJBS+KMB+tX7QwudzNcZ4a5mgaZ0pqcZlGRIyLhBQiCK+94a78LLeHdjXu3LsvOJLS1vUDS8dX9xGmX8+sBAXIQvUDd/A9eqr9qVSTG7Go1SsFryA3AAeX8R0zZgltAoMemAa0TEWlv8vYi4YUQEJAHmHxWkZ6DWhrrpAC1PFsNCh16TRpDGbEOryjqdgc90VKKSasnowQi0DY5CLEa+sYIkUBcbwClU8IsCatRWk+7V1qw77Z9UKojynlrInlaWLLjomQU/v+ZHRxvVlfpZo3CU1DD+taVnkrwM9TOdQ3G317n2oyauKSetFyoxGe8TOlltbjgOSSMF9Q9MwFAZWlOymwQZ9Hx2yj4yP6N4YThWuKwz6wPJAnn3H8jFxfJgAJ6lH6aNwwpicUUyptCVVvIvuPha0MUJHg052Dl2SUaCtHbr8CSp/wYJcreWv X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 4a9436d8-edf0-431a-59cd-08d8c161c3a4 X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 18:48:11.7967 (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: LQJuhCPWHNe4u79KSeIYRpd32lsIzfpUJ2mte3cIFcwmIxRP654FGTcm5bxKv8Y6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5563 Received-SPF: pass client-ip=40.107.237.112; envelope-from=alxndr@bu.edu; helo=NAM12-BN8-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: Alexander Bulekov , Thomas Huth , philmd@redhat.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alexander Bulekov Reviewed-by: Thomas Huth Message-Id: <20210117201014.271610-2-alxndr@bu.edu> --- docs/devel/fuzzing.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/devel/fuzzing.rst b/docs/devel/fuzzing.rst index 6096242d99..5f5200c843 100644 --- a/docs/devel/fuzzing.rst +++ b/docs/devel/fuzzing.rst @@ -119,7 +119,7 @@ Adding a new fuzzer Coverage over virtual devices can be improved by adding additional fuzzers. Fuzzers are kept in ``tests/qtest/fuzz/`` and should be added to -``tests/qtest/fuzz/Makefile.include`` +``tests/qtest/fuzz/meson.build`` Fuzzers can rely on both qtest and libqos to communicate with virtual devices. @@ -128,8 +128,7 @@ Fuzzers can rely on both qtest and libqos to communicate with virtual devices. 2. Write the fuzzing code using the libqtest/libqos API. See existing fuzzers for reference. -3. Register the fuzzer in ``tests/fuzz/Makefile.include`` by appending the - corresponding object to fuzz-obj-y +3. Add the fuzzer to ``tests/qtest/fuzz/meson.build``. Fuzzers can be more-or-less thought of as special qtest programs which can modify the qtest commands and/or qtest command arguments based on inputs From patchwork Mon Jan 25 18:47:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1431330 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=UCvLlElx; 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 4DPf730rZrz9sCD for ; Tue, 26 Jan 2021 05:49:49 +1100 (AEDT) Received: from localhost ([::1]:41870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l46vp-0004LB-KC for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 13:49:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46ua-0004IX-J3 for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:28 -0500 Received: from mail-bn8nam12on2112.outbound.protection.outlook.com ([40.107.237.112]:16865 helo=NAM12-BN8-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 1l46uZ-0004xv-2x for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:28 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VtqiyaJeFPfEDXdo00oGWIgUlId/GcjoOlHK+r/nXbfkgLUyu2KqNr70xqsNj/3gOBeP2uM8UJHNftomCIuNGObodvI5VRTvXxUS/k5AS1nZWQLm4DUCx/5P6uS8AdlLSaLCrUFq2mVRsAPKOmhsoMA9q3v+ulcp0dKw+fjc811DjdID67E9SmPBofmexR1+NIhkGpyscP771qUsK21ci3KI3nPJtO839uyjGgWaz1AN5hP57pCUfKF5QLE0ZAYe/YEQFy77etpAVDdo+7Sy3N/JFze8l4rdeGAsnI6paJIm5S9i/A65Y6afADOj6aOKeuwVsnERHyxzUnkW8Z+0Sg== 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=0hhdo7p/vW8hU3vYuOefZwl0z68bsWvgOfxCNdDUUNg=; b=X5N9KbDadgm4grqy8vmDJQ3Gx6d6jN5A0xzCpxYG8gG1cieD3Jle0CvG+X0bqGrJ/Z5GCa8+7Lp3h2JakBuaiw159mjT5RdkG0efLZwaRFdFQXTuzu6M14pIYfuPDtW+EIQ1/2nXisIZD6zo+TBcNyRPZrSR/8S0rRffrN5ryWBt94BDGBNXBza5DLMQC2wVJ/A+qwUToqMtJoZmogw/7D6a6Kt7skWIcDXSpJQ9RcTrtfJCGhEgTTZ1RDAYAjPbKlnqW8dcKmJUiTc1cY3CWD3/B4ZG05kEgrwzgVVMhvCaSxtzmfKQCTFmSAvf0m1iFkEEmOtDMKl6ipyjEbvqyA== 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=0hhdo7p/vW8hU3vYuOefZwl0z68bsWvgOfxCNdDUUNg=; b=UCvLlElxSFw15uAZtsTA70lzFmPl7tUplfFl2bSU2wuCGBgQ9/hoSDw0VbGdRPkFeMSRfUDVF+Jfw+EZdDUjqv4l5se8aGCgkDqbt4/q7ESx2D4BGUl6grjLwyj1YLswC26+Wdpqc8q1v+UYAB8+4o86QOn59UfJW4rVRgo1LWI= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5563.namprd03.prod.outlook.com (2603:10b6:806:b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 18:48:12 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310%6]) with mapi id 15.20.3784.015; Mon, 25 Jan 2021 18:48:12 +0000 From: Alexander Bulekov To: pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [RESEND PULL 4/7] fuzz: log the arguments used to initialize QEMU Date: Mon, 25 Jan 2021 13:47:53 -0500 Message-Id: <20210125184756.319453-5-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125184756.319453-1-alxndr@bu.edu> References: <20210125184756.319453-1-alxndr@bu.edu> X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Mon, 25 Jan 2021 18:48:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76815065-c354-4189-3a3f-08d8c161c472 X-MS-TrafficTypeDiagnostic: SA0PR03MB5563: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:962; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iLXs3A+zRfthvO152Z2HcSGcOtYdpR95nMX2gmCrW5rrp77e6HE7lkgWs6adY92jj/wfLMwH0CI0brFST2YlWfDDKyyw6rAKuM0RuXrVbRx4GBP2DLr1OEHB0i7y/vT4g9N9T6m74iOZV+PX59mXfmXKn0nqRp+C8yQilJ6SRceTNtjARN+JXgqxd25ejQyermBcVtN91QOfc1rj9nm1D4CDhiCJ9QsA80mQMiGhb7iJJON0JN44AwB9yNYEercJOAOtalZDAzM5MiNVZs/eMxE5pMXtCB0T+WEf1segy2UidSNUAhdSw6bVuN/464qBWmjy6nUhj/xQiNKXBxtJuKJS6JkZWkYVeIs9soAVGlxwR8NX7gTMKmQhwM1aleEZRMRG/GpMMnAEK2OVgj4ofg== 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)(346002)(376002)(39860400002)(136003)(366004)(1076003)(75432002)(478600001)(6666004)(956004)(786003)(86362001)(52116002)(2616005)(54906003)(2906002)(316002)(83380400001)(8936002)(36756003)(66946007)(6512007)(6486002)(16526019)(186003)(66556008)(8676002)(26005)(4326008)(66476007)(5660300002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: vXMdfAk6PEq6vkUr+XTyBRI9VoC03BCwv/Vc73gIfgx0UuRS4JUyJGmtoAxRFTnoi1bTYOox1CBMVFzAXfX3Wl7HaW3QJL9PwT8bZov0xpHUu18v3mfwUsISXbvnmsOw3CbUuSnWge/sYPrAN5rHzW4Cq4S0lPrXc8DBsfNYEc6Afg64MerPIDcW9sOSI9eX9E3clW4/nDiQPOZaxadu538VcBGyeNERuccwlJz9mKVNbMZ1z433N0RM7oBISle/EuZezw6FQYaDew9GQ0eUXMnAaFf6g9tlzuZ1rMlD+gV2Q8aTLlu+heOi/fvkRoE79JXdDXGbyMYtSRPsEQXuKEGq7MRTL3DA9LDNaVMw1qax3ALJC7MtVRcZuDW1aenQrAoCs27RcPOObeugiPZ5Fa93EjRIwmOqmxbFXMsJrNmblXDZimQ4W6KXdoMjOufCKrZXNnH9NpNG7T3yVgk9wXVTNX/krtfcNXlDGzrMOPaSpN5yW94RNXq6usKP+qsmhsR13+NRQ77WNhpcyzUntHqndqeen/e+sn1Y6cBca8BiNDREjShNUIixv9orMA+5m9c0SbZ8Lz4ikl2hN24CvdK3068dJRBrJt0DMTEFE3BPUiMKy4Id3w/jOghKjlFPilgTGh8zocW9tct6cS6Rch8dU5BBQ1Q3/M8VdkeWbG3GzOmez2CkSMQN3ButCK6TL8qI6n9vHFPXZysthzS+lBQrJ32QGNb/Ss2DGCK4nehjwsfvOci8fi38zY4ebc5gQEb3++372Q8meLOzZ/xbLd/LSAcB03PhCrmD7MjXdnoHFSg++xomTHDkr4f63PvNTH5wr99jCieUvX3Kao8kszdfSkG9qUpNcyTun+Mld5XUF8HVnTKZ8CiGIa8mypR24xxjJbm6ns6yDhh/33uttZFK/BkWswq9znSBqAsSYbT3yCRxxPiNGoEGVX7VG84XJglNnfUZfIf2IUxHAZIqrDXCRUJPJTgaeU33iPkvSU6/1PjFlM6MiuVHTATvaH9wVtmkmLT1Rzjr1k+HzhWUetSVUrKAqBzts6VKgmNYH0Q3CT0uhpTg7f2S6SP29SDm X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 76815065-c354-4189-3a3f-08d8c161c472 X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 18:48:12.6513 (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: hWqwfo5eoGmPhvSO01pZfP40wiZ9KyZOBKPBXEzQ4wak8vMBnkrFPh388AXRixbz X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5563 Received-SPF: pass client-ip=40.107.237.112; envelope-from=alxndr@bu.edu; helo=NAM12-BN8-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: Alexander Bulekov , Thomas Huth , philmd@redhat.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is useful for building reproducers. Instead checking the code or the QEMU_FUZZ_ARGS, the arguments are at the top of the crash log. Signed-off-by: Alexander Bulekov Reviewed-by: Thomas Huth Message-Id: <20210117201014.271610-3-alxndr@bu.edu> --- tests/qtest/fuzz/fuzz.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index 238866a037..496d11a231 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -159,6 +159,8 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp) char *target_name; const char *bindir; char *datadir; + GString *cmd_line; + gchar *pretty_cmd_line; bool serialize = false; /* Initialize qgraph and modules */ @@ -217,7 +219,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp) } /* Run QEMU's softmmu main with the fuzz-target dependent arguments */ - GString *cmd_line = fuzz_target->get_init_cmdline(fuzz_target); + cmd_line = fuzz_target->get_init_cmdline(fuzz_target); g_string_append_printf(cmd_line, " %s -qtest /dev/null ", getenv("QTEST_LOG") ? "" : "-qtest-log none"); @@ -226,6 +228,13 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp) wordexp(cmd_line->str, &result, 0); g_string_free(cmd_line, true); + if (getenv("QTEST_LOG")) { + pretty_cmd_line = g_strjoinv(" ", result.we_wordv + 1); + printf("Starting %s with Arguments: %s\n", + result.we_wordv[0], pretty_cmd_line); + g_free(pretty_cmd_line); + } + qemu_init(result.we_wordc, result.we_wordv, NULL); /* re-enable the rcu atfork, which was previously disabled in qemu_init */ From patchwork Mon Jan 25 18:47:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1431335 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=NYCaguJ3; 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 4DPfBr3Ms6z9sVn for ; Tue, 26 Jan 2021 05:53:08 +1100 (AEDT) Received: from localhost ([::1]:50656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l46z4-0008Is-DR for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 13:53:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46uc-0004L8-9u for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:30 -0500 Received: from mail-bn8nam12on2112.outbound.protection.outlook.com ([40.107.237.112]:16865 helo=NAM12-BN8-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 1l46ua-0004xv-Pg for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:30 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gohxIPReb5/J9Q38eEkOfLfAkBxJu0OaIQAMrS1UwsvIuoCLOIwEP/gXKsiA9WdNGH2hMEwuDRRluFecLNwlf0kE49eVI8saL1Mz0o7aFP0IseO7DMlU/rq1vxN4pCnnvBUVwQIVXYPgJifba7yWLWQrbyB/Ej4mbtP0ne1mBys0SzlS//NXiV2CJCQxbOTD/bVgLchkttR5V9C9yQGHHhLwGBVhqydrzY4NbXjUVp0lOGUaT4u7Z0m7e2etP9QyBbd82PyLqLl49R186VV32gGrdrgY1Nh9Mly6Tb61FbHQGBSKk2j5v6YkqqWsjxdfr1sAYYbz0moql1rZIrHTBg== 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=jxdKhxYza15yI11/yMak4n7yM/SmffxiKxjrYAnusUM=; b=ISAOEtWs1v6wmDyucZs/9cvGYR+qPz3d4DnC7LZGecZWOUon+WaGtrELgTyKPbzkEOsIsFmFecw1sBG5Q4T3CMB5vOI0g4T7Vt8oi9+x8kiVPDCmzXDsMEqyfQtR/AlBoPirbdTGriREQSaf430YQiZYyV6hzOqy1dLUnyYnv8SJwZ89ic0gZ/QYk5gCQsStD7jK16Q9g0Qi/x+qg2ugV4AAGbvuofwjpGok7zwlrNar7HZHkzRBYlV563PxPY6YbcqYQUhviGdT0+2psvFgat3Spfe5IVCz997eNpLkF6A+KQNc9jQGQ65R/AYH89hJlr4VMrnpvR6GBXaYTpj41A== 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=jxdKhxYza15yI11/yMak4n7yM/SmffxiKxjrYAnusUM=; b=NYCaguJ3dHqiD2Hjr31VgrEGrSDtLW6YYZ0qI6Tx/WCGOC/Wbovj9DZ/UU627T+XBp2UDmX4H3rTa3tox62xbnV3XFKZ8Z+R/MHosyA0iq+6DS+rM/FK/ilAsFyVnka2Bw+ADRDxT54b1ox2Cp8VAC0EBHvkkQsovj5PVnb7YU4= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5563.namprd03.prod.outlook.com (2603:10b6:806:b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 18:48:13 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310%6]) with mapi id 15.20.3784.015; Mon, 25 Jan 2021 18:48:13 +0000 From: Alexander Bulekov To: pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [RESEND PULL 5/7] fuzz: enable dynamic args for generic-fuzz configs Date: Mon, 25 Jan 2021 13:47:54 -0500 Message-Id: <20210125184756.319453-6-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125184756.319453-1-alxndr@bu.edu> References: <20210125184756.319453-1-alxndr@bu.edu> X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Mon, 25 Jan 2021 18:48:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0225a193-ea21-4d8f-6e56-08d8c161c4ef X-MS-TrafficTypeDiagnostic: SA0PR03MB5563: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FXgZW+jwzsIgcjyg/6Y11kudbhOPUJ+xjn5cxMpXebzmv/QdqZLO4xbte8zGztYFxBu6fnY5tqlvFrrarzfEiMIOtxPlxz5h47G4zr/G6IIHKXxUzodbQIcBbTDMxadw7u7cl2J/8+Lc3JYHNHoIIgFO2b5eY6ppef9tn3XmNkaz2Zm/kiyEfAkjBm0ZERFQG++ymFmT2b0qO9Ve69s+pGOzpddJVf4amm/wAYxo4rfxwPJ3GtO98tdJyVsJ5sdtmH+658JNDuDIszFiTKdI9AV6kLhyDnsuRE8KM3wTgHKBRfgITcys4gEl4nxqt7g5OsIk+zyg7tO38zeVnDth+mKHE6l2IpbbKOYtVZGTbCKbG2riKSBO2XzilIhgMGpiUHpcJWSG9aTGOAVY2JIv/VG4CjaJ3Ke8TzaNcMV8+tDY+lF5a8uuab1kOW6WEIuG 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)(346002)(376002)(39860400002)(136003)(366004)(1076003)(75432002)(478600001)(6666004)(956004)(786003)(86362001)(52116002)(2616005)(54906003)(2906002)(316002)(83380400001)(8936002)(36756003)(66946007)(6512007)(6486002)(16526019)(186003)(66556008)(8676002)(26005)(4326008)(66476007)(5660300002)(6506007)(41533002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Ev6RSdemawgWxwAoQAC8CT8+T7hihXvISdeeFhQzSO8I/B73x51n9a1UQhTBdcigaxUA/yja82My31cRt0Kvs3uTW4N4n++6TrgeFBia9iPR+/xt1jiOK0202qsK2rRoi8glIOe4cCsRoOLruEseKagWtR35e4ce40PC9DrvILf740KST8mB5SLf19W3ygazHv0ltKx5ZQQg2w9/pezAWeU8Jm3N4HrfmQ4pNN54D5SdWomaKM+XIqYkiGGyvlVV5B3xEN1kQaIVLRZ29aWqCPlqQ4PsufZnxKQwAOaF9hgj0b+nk2yPKmWNb8uvVuB9ta1uRwq3pk5yw1z2apZTbhtaGDVZvnHVYRDXiHeO4HpXEIhYsdPs98Ws55eZ9yqVf0+zXk/FYnfVaW02+AOxMspWMp0d3drgejCch2+tiNRDvL/NIPvUBKmqbwdVDoDbAAvyzZHsr8m4xjoTcQ5RfLOP+NECu0Mr7nqy1mEyWIyWWfTLvmKpfv4pzOKLS05TgyoJln6UxWHQXRNpYedZm9CFVIXm5WvRnGimcOu9IBtL+p+epKFYDeB2ilICfX+OXFU946k/USyfszr6DD484yLDyEtQXTzzw+jcb3a35JW9f28R9G9R7XGfvmln5S3kzPlw+V3DrhP7bYAHdX8+rgHHFyMonp3MAMX415BmCyVPCp89KeUzjWC8mpGTXiQHKgOcP3jKQx8Xr8K+iPK/bvarBAK53GlyemAH2RlHf1VbUjbBOPk8TG90/XcpIibwo80xaLz/cfYCN6+LAYHBuwIqmpWerz0QIUeil6eGwQs09s+dD8krjopZSjIT78O6pOTmRofjlIb7LZdeh8HZWd5BjewTTeAjkkRBkP/2UdF8FPf0zuVRBlc8uBQsYz0+8jPGJ6zMXiFvbrg+MdNd+MXDvMG2+KZ7fzWAklSCxNy2qymXgkGYkseucdeRzl4tx+frpk2AIyyLmYjxt7KzTBlLaUy1BZRhTYngSFF25+EqS/uvd7BKOS1ZqM2APqmyD6XDiXLsBO0PvVh6uanqz8T24tjMylMQBBF8IJwYBoGj6zwAdJOt3n+14R5CfcZY X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 0225a193-ea21-4d8f-6e56-08d8c161c4ef X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 18:48:13.5158 (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: 2rdeogn5HMD3InTc8DsXVSzQC+e4awbkgD3EkhuiohWbP+6DHxyzdoxgnmThck/Y X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5563 Received-SPF: pass client-ip=40.107.237.112; envelope-from=alxndr@bu.edu; helo=NAM12-BN8-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: Alexander Bulekov , Thomas Huth , philmd@redhat.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" For some device configurations, it is useful to configure some resources, and adjust QEMU arguments at runtime, prior to fuzzing. This patch adds an "argfunc" to generic the generic_fuzz_config. When specified, it is responsible for configuring the resources and returning a string containing the corresponding QEMU arguments. This can be useful for targets that rely on e.g.: * a temporary qcow2 image * a temporary directory * an unused TCP port used to bind the VNC server Signed-off-by: Alexander Bulekov Reviewed-by: Thomas Huth Message-Id: <20210117230924.449676-2-alxndr@bu.edu> --- tests/qtest/fuzz/generic_fuzz.c | 10 +++++++++- tests/qtest/fuzz/generic_fuzz_configs.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index deb74f15be..ee8c17a04c 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -933,12 +933,20 @@ static GString *generic_fuzz_cmdline(FuzzTarget *t) static GString *generic_fuzz_predefined_config_cmdline(FuzzTarget *t) { + gchar *args; const generic_fuzz_config *config; g_assert(t->opaque); config = t->opaque; setenv("QEMU_AVOID_DOUBLE_FETCH", "1", 1); - setenv("QEMU_FUZZ_ARGS", config->args, 1); + if (config->argfunc) { + args = config->argfunc(); + setenv("QEMU_FUZZ_ARGS", args, 1); + g_free(args); + } else { + g_assert_nonnull(config->args); + setenv("QEMU_FUZZ_ARGS", config->args, 1); + } setenv("QEMU_FUZZ_OBJECTS", config->objects, 1); return generic_fuzz_cmdline(t); } diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/generic_fuzz_configs.h index aa4c03f1ae..51e69c6e42 100644 --- a/tests/qtest/fuzz/generic_fuzz_configs.h +++ b/tests/qtest/fuzz/generic_fuzz_configs.h @@ -16,6 +16,7 @@ typedef struct generic_fuzz_config { const char *name, *args, *objects; + gchar* (*argfunc)(void); /* Result must be freeable by g_free() */ } generic_fuzz_config; const generic_fuzz_config predefined_configs[] = { From patchwork Mon Jan 25 18:47:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1431331 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=XOTF1uNs; 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 4DPf734V93z9sVn for ; Tue, 26 Jan 2021 05:49:50 +1100 (AEDT) Received: from localhost ([::1]:42102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l46vs-0004Ra-R1 for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 13:49:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46ue-0004Op-AR for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:32 -0500 Received: from mail-bn8nam12on2112.outbound.protection.outlook.com ([40.107.237.112]:16865 helo=NAM12-BN8-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 1l46uc-0004xv-Hw for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:32 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lfYLSMbiH6n9zWS4eBtnM5X7L+PjNd8TGqPcurV8f2M7YzZpyKi2+q1qcnWO/e2Eqb7w7vRCkW8/qFCSvdeuN0uwq8t98kmfzaiRU4KBn4XExhALJfp+DC66o0GLgsdZGonqF0t2BpNeIkU3l6VRYMYjbN5zYO6jAbivdKiuN6YeJX4D8EkgzAsQElpqhfYsVW4I5XEudUD17rH3appBCe3jK9/xfjQloVPZSXXdp0xIElJkph4PuLSc2M9xY54i6fx/yPWtgmOLKYmiSNp7mlvEjT82U9Byn9+PuAYwqgui1Q3UmsIO7xIvntYS/djUdKnJ6sN1lztDTBu10/hATA== 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=5/KQK2YszdmrH9IGp1twtLfc1tvsY3GwSWUNIeQocHY=; b=VxCxnh+UdxFD5YQU40Erg4shtTtaWZvQkIGksYMhaZrbp3Mw2nXo4Dj4eYUAfwrwI4p0M7zCGvEF+Bkfqg0VcJbgQHCoMJ+ryMJm2STg0rosQXqdWounAjWVYHwS6I2VEdBrdnpoQp5YjPCdLFCQyE7C6gkOL580WCgQbWYbmmarECXKK1hHDae6oQa4AYhC9zzwwfgHDn+MCffheo6LPmpuqDLpUXBN4KrvTTjZVO/JjBDNfPDdIdkTKDIAPUo55BX73WqzcovJ2mccSfqqkiohw1uN/a8DYb0EQvdgkdMsvQJJNY9R09NAEzCPD7sdzzXJaMcR8bajF/p86QRPtw== 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=5/KQK2YszdmrH9IGp1twtLfc1tvsY3GwSWUNIeQocHY=; b=XOTF1uNsWI0ypUJdy9igXpe7tTs2VGyUbLnaPysRmdrcoRbLpvNgg5ICh2B2RlLph9Mr4oKDICNo6eyocJmcpX9akTLApbSMYB/XJ8eTYWjisbzDViQuVWM+bH+9wUn0+FGijKsov81VBSBwBIgX79QMUH5QKi4vfZ8BicFfVbc= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5563.namprd03.prod.outlook.com (2603:10b6:806:b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 18:48:14 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310%6]) with mapi id 15.20.3784.015; Mon, 25 Jan 2021 18:48:14 +0000 From: Alexander Bulekov To: pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [RESEND PULL 6/7] docs/fuzz: add some information about OSS-Fuzz Date: Mon, 25 Jan 2021 13:47:55 -0500 Message-Id: <20210125184756.319453-7-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125184756.319453-1-alxndr@bu.edu> References: <20210125184756.319453-1-alxndr@bu.edu> X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Mon, 25 Jan 2021 18:48:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 138fe51e-837d-4fdc-9462-08d8c161c57b X-MS-TrafficTypeDiagnostic: SA0PR03MB5563: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pDr+0tu4Blj9eFUdQPrQaigdVz1dOTOyobADPIEhSDykapLfB7QIyZYLAL3RrzBxr15BzeRjh5fEjYxqhgr16NLrxmrNdXwfnXrhCoyIVqsCsh88+6k92j8KpeWMd+dBYnykbcT4R6n5Qa7kbAA+AfnSj9jW5P9PdwQk98jyShX5/WO2wxDCzS0buWbxqKH3PsCQyZYtMTREes2n+T5q1Tz2/JVOwNXJY0XRCX7/6HjYNgI1INqmcKRc3D9C+uSdvZIn7XfQSLSN1UYDEyJAdEoa4MzyoNm2omzRfylCKZzLGdSS3LPJMyt2x27omJPm/nz32ipmzZ1SdRWLaNSRro3qWOJdEqCXVb53FB8i5RQqsss5NWsHk531DadUwz9YeM6hsdGQmOEGbNQs0XWxc74kgzxiOH2gFNYdjS1sGeWS5PAaF7iY5Q8YuQDgwmn7vCU8AWgbCTuy7yVUGM6IAw== 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)(346002)(376002)(39860400002)(136003)(366004)(1076003)(75432002)(478600001)(6666004)(956004)(786003)(86362001)(52116002)(2616005)(54906003)(2906002)(316002)(83380400001)(8936002)(36756003)(66946007)(6512007)(6486002)(16526019)(186003)(66556008)(8676002)(26005)(4326008)(66476007)(5660300002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: U8gVt8LjLLsfCqXl6LJAsNsVAUOe/W6e0p14Sgt31/o3LBZybkNOcO8KQSaZw5pINXlnScT1u/A7kLJ4j+eg6x5fI+wpjsjWNFw9HrW55WXd4OOBTyU/Z9NbgU1MmfkyV8WNVIMBNsa6+eX0WGwIu8Gxb5OA+TzO2ATfNmRvjaZqZJnc6Qdazn7w86dhvqafjGfFrWZQZZGCBuQvL5Qv8rdjpmhOOncO2xpm5zTJGpnatbUnY9Kk2Byd2HBIvJJOtfrqcTFnEhGd9nqNX5quASU3CDaYGSX6HPfUKJ1mHk3QrcNweNuMv+V+7XZ2geiZeIttWhr7KPUOSFvFeUfjp9x42qUm0sPUq7zcllF5LIPuAG0R4egpLfaTL6Rv5KSRK2Rj78i/9Fj4seCI1lZ8XpftTWK3mTPfxgDldkUdNLa8E4hAfqm53TUGHPd8MUQeO68abttr58+bCFDkRwGP9yCG076kTCuO9qRfoF62bxyOp5CphKoKhIIgiDhFzPDK7IhZlNMRmJUaV+ZKLyeiOwMNnGBEycD46RfUYF/cy+kMWnrmxrgovPpaO/Ta9R6mzlmQUmFZObZZAds1bMMR5LyXxP3IIUvqjmnmJxbr6tK6HwdWGMnNkZOVkTU+qtwmdUkpRcWhbMyQgDhYR03hmmJ0NE01D4Xi2zBPYsuSLz59RrjC3SdsTm67Rx0Ffyy8BRbGrrXTs5+G22BiyRhi+OIlfv14xq7RAFP4tqYUQ7f4DJJ3txlW/mgQ7Uj1HgK6hZt+JQxzyCG3gxx1zGdxP3fecA1L8HX96MMSO98Ix6Iu0UvMbNEp8SyY1ewf+Jl4SNBXaZTe1o+Mhw699dpfnoBVB8SG0/umQnv2d3jYfvot9jPHKV/3/hTY9khQEYyBH9/x6juH1lirlHtSDKXjZg02Ouc7KjhkrEFNFK5U5UkDD5LX3yp/to+yvJQSK5KP5fDI4iRrw8zwgQqWVI+L5E/TnXz+RJjxkgmHbxuSyOv6HFP+43yS9+ixZymqlpUjRbjE10rh+6H3rf3u0M9q9CNQ5C9g7Taw7GkEzrxrr0XIMTWyN2emzCzX6nl53vH9 X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 138fe51e-837d-4fdc-9462-08d8c161c57b X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 18:48:14.6251 (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: HWRhwT/HbG2fobJMxmIjLQ7H2hsKn09fis4AL0qYtr47CC8/ThyhzMG9OUApWsGk X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5563 Received-SPF: pass client-ip=40.107.237.112; envelope-from=alxndr@bu.edu; helo=NAM12-BN8-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: Alexander Bulekov , Thomas Huth , philmd@redhat.com, Darren Kenny , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny Message-Id: <20210117230924.449676-3-alxndr@bu.edu> --- docs/devel/fuzzing.rst | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/devel/fuzzing.rst b/docs/devel/fuzzing.rst index 5f5200c843..b9bb07988b 100644 --- a/docs/devel/fuzzing.rst +++ b/docs/devel/fuzzing.rst @@ -180,6 +180,32 @@ To ensure that these env variables have been configured correctly, we can use:: The output should contain a complete list of matched MemoryRegions. +OSS-Fuzz +-------- +QEMU is continuously fuzzed on `OSS-Fuzz` __(https://github.com/google/oss-fuzz). +By default, the OSS-Fuzz build will try to fuzz every fuzz-target. Since the +generic-fuzz target requires additional information provided in environment +variables, we pre-define some generic-fuzz configs in +``tests/qtest/fuzz/generic_fuzz_configs.h``. Each config must specify: + * ``.name``: To identify the fuzzer config + * ``.args`` OR ``.argfunc``: A string or pointer to a function returning a + string. These strings are used to specify the ``QEMU_FUZZ_ARGS`` + environment variable. ``argfunc`` is useful when the config relies on e.g. + a dynamically created temp directory, or a free tcp/udp port. + * ``.objects``: A string that specifies the ``QEMU_FUZZ_OBJECTS`` environment + variable. + +To fuzz additional devices/device configuration on OSS-Fuzz: + * Send patches for a new device-specific fuzzer + * Send patches for a new generic-fuzz config + +Build details: + * `The basic Dockerfile that sets up the environment for building QEMU's + fuzzers on OSS-Fuzz + `_ + * The script responsible for building the fuzzers: + ``scripts/oss-fuzz/build.sh`` + Implementation Details / Fuzzer Lifecycle ----------------------------------------- From patchwork Mon Jan 25 18:47:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1431338 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=D5oIFYgN; 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 4DPfGl06bpz9sVn for ; Tue, 26 Jan 2021 05:56:31 +1100 (AEDT) Received: from localhost ([::1]:58980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l472K-0003MQ-W1 for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 13:56:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46uf-0004R9-WA for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:34 -0500 Received: from mail-bn8nam12on2112.outbound.protection.outlook.com ([40.107.237.112]:16865 helo=NAM12-BN8-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 1l46ue-0004xv-IC for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:48:33 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wwo5uX3wTs4PJeOAABuyDYa7yvybTtGYDSbok9H1VUQGqlVavdzSdKybmPnSvxN9TeIKicNUq3q+fe33LSU2/DtxaXUblYx9VFQ3Rp71GsFgIAGyBxPGeg1U3XjPLAoM9EccK0c/qUPVVO2Cw9uYtV+znQkqMn2k7wCFNAywiKZL+5GXrWOID0tly5MWOR/NpDD+2moW+8LJ5o6b5fxM8pwYr3IMo1xmwHtV3REDDPaYK4OKN9PIN1CzYKqynxa2Y8p0jicEHjQbZ+2ET30yNgNPbQLiVRybUawkwkQccDqnlV1vPfeGRe6MTAyYei97dB03PebajyFr0Og3CvnIUg== 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=lYxpmhMwfYrRCykPgMQMBMHyt/4lYV22U7Bt7JAlckw=; b=O4U/TVvzN0+a1nbDHzOFc8p+20k7B6FN6RidnE2djgqfdUCxt0KWfeywVEXDbgaD6pOxb/x4pc0AEFBxkQi1XEXNhmUfVQ+GnFjjHNY9uAWc+b/QAssXRWtylDLOVjagt4UVmTkzpKs4ef2u0uz39DcMPnQBaWZGDu2h/40v3BktSDtlPiJ1R7YlMF8fjsVxPDWSpxKcV2qGu77O2p9FKaRJxbOd8xjZy22MUxMov2ZS8drp6JCr5ZqBvlNYgVcLWmpinEzxpK0o+NmY2KDm310fOB6QOiyPcNK7rs5fiiYHY1Cs7HNff2n2W5vpxuMKWTPDscPVgXdN17TpmVyaVw== 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=lYxpmhMwfYrRCykPgMQMBMHyt/4lYV22U7Bt7JAlckw=; b=D5oIFYgNrp+YVwW0bu8PIHBE87Z1jYTx1hiDiCk9K3qOUjvdGdgsYTfgpf+Gb4qm74z83jMl+Ov1mlL9DRVUav017bnedUXdXNzbRNKxW+FW0KFvSVG2bRFSvYvlKLDdxo/TiIp0XvdJLEP0OvdJK47TbnXTh28DE9g0sybSIKI= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5563.namprd03.prod.outlook.com (2603:10b6:806:b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 18:48:15 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::e828:cd84:e00c:6310%6]) with mapi id 15.20.3784.015; Mon, 25 Jan 2021 18:48:15 +0000 From: Alexander Bulekov To: pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [RESEND PULL 7/7] fuzz: add virtio-9p configurations for fuzzing Date: Mon, 25 Jan 2021 13:47:56 -0500 Message-Id: <20210125184756.319453-8-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125184756.319453-1-alxndr@bu.edu> References: <20210125184756.319453-1-alxndr@bu.edu> X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Mon, 25 Jan 2021 18:48:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b8610f7-a879-4d4c-175a-08d8c161c62d X-MS-TrafficTypeDiagnostic: SA0PR03MB5563: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AWZ5K6/FE3ToiBsDXoRNWWjh9Wn7q8g4Gt53Tv3/Elo2cS+7UDjn/RAtqlziLBOZu1tE2zciXFe4lR7p3APMDNqy5d9BfLApIvwkNDj39TmvVfLn3oHeiwivR7n4NpGP4C7zlDQP1NJQp+F+8igvbWxFIynPT7Gb6AxacJ0ov1ZOp2TLzcIX0pYS6bXOsxyzeediG8s5mhgaDMZgqcDZH1++mzWeHP4DzYQD3GZKyW8wHxcsS+2ZQwAyJjxPIBG8gAhwTxdecx79y9bcflvW+rW1PJ49RqDbX4ISt4XQtgDVaC2NYwIuiOxpD8sGFDsHwluRr86pkLMiq7hCrB32v2si2WI+KY8vo8UIIKJKslYe0jVLvKmgYD017BKfYpuZhNCXt+UdX0ybogI8L4WhdA== 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)(346002)(376002)(39860400002)(136003)(366004)(1076003)(75432002)(478600001)(6666004)(956004)(786003)(86362001)(52116002)(2616005)(54906003)(2906002)(316002)(83380400001)(8936002)(36756003)(66946007)(6512007)(6486002)(16526019)(186003)(66556008)(8676002)(26005)(4326008)(66476007)(5660300002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: UTbnImQNEIxvt4JBs8iMLEbjxi057ks6WbDWhBbkiYd9W+h0s3NkvbQjtwVAMBxkvNG92gQ31A7B912wEkfJ63JEMwCpKtphYt6Cn3Z9x/Hj/JbRkoJm39m0vY+yoINP27YuMJedkp+jRfUla2VxJYKpq9nny1GWZtASFP2ldI4N/Ei6S+B3PkzmvkbBAI9VNm8F0YxA3CijoNxuk3wKTzpwNXkZWLJp22BgnkAiHjmjurtPr9RDJI9/H6dxBeVkDST3h1bI6MunKwC8U0bWeNCAu5tlmYmdTzvrFcBkfUBkOWXfFEw0acdcp87qykhfGEKOH0rgxMjTdXHap0NuX6cbcOuHRqGp7GkorS+PDJCADkRiX49HO6KXXmIJiHTnXTml/ICLKrCKD0AAGyE08/nTHaySRTp6PqRnIHXur4+Oj4AwOzuSWSle6ZBv2BNXijLuSVchxJ2hq6KNmRmpUZEHqkm4VFanz95DsZaQaECe2EOf1XN5PD2JulklBDLmlPlslUDBw6Cj/kJM+lJInWSHTK7SYLcW/JJBhlGWYoXoWhXmU9OdhAFS6BFiDE76MQ50NV61iCRbkqaW8G09l5Unb06z7Qj3SeGt6w1oApb+QF7uWFZuy/fntQjRIc34WrAHT0jVAewaeUwhPZcl/Pr9jzeJzMPLWLwQP9OrpeYsYa7wkrSfKvUIxMSQKwRqPftNG44GBLb4UWZtNsfd2krAq4Rtz3noHziB7v64qpihrB3TORRHRZq9TrQ87T+mKLtpZS6fyMc/JHOj+iLF+sNViXliAV4+Yrrqyzymy/Rcn+SviJzzwwXGxLNlGSm3dlqH3o8KjGlv/DzRHUmzDjjJB/ZffbIDJPEg2vdxeXy5Sl5GvV1UU/jQLySRGSitMxuTMTxLJB8JuSghsNOifra2L3Xxj/3g2VE/NvSedUfKQEoCVgXyMiEYQqQ64+NrmtlF0XzsDPVK9g1K8PqyHWZiPetIfVJOT71dgoSRMcMLCeu4T9pTts7Kv7O5wKUdpBFuj/J1Zzj09RaDBRfsFt/F490F1M/ypbdX05FpBIgEHF/Cd/DDOEyZUCZU0QQs X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 1b8610f7-a879-4d4c-175a-08d8c161c62d X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 18:48:15.6016 (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: t9IuS3vVDT29qD9epZ1vMYNs5wzG9YdMeAUvoO9/ZllaEAfS7Dcf2jvAZp56v6CJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5563 Received-SPF: pass client-ip=40.107.237.112; envelope-from=alxndr@bu.edu; helo=NAM12-BN8-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: Alexander Bulekov , Thomas Huth , philmd@redhat.com, Darren Kenny , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" virtio-9p devices are often used to expose a virtual-filesystem to the guest. There have been some bugs reported in this device, such as CVE-2018-19364, and CVE-2021-20181. We should fuzz this device This patch adds two virtio-9p configurations: * One with the widely used -fsdev local driver. This driver leaks some state in the form of files/directories created in the shared dir. * One with the synth driver. While it is not used in the real world, this driver won't leak leak state between fuzz inputs. Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny Message-Id: <20210117230924.449676-4-alxndr@bu.edu> --- tests/qtest/fuzz/generic_fuzz_configs.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/generic_fuzz_configs.h index 51e69c6e42..5d599765c4 100644 --- a/tests/qtest/fuzz/generic_fuzz_configs.h +++ b/tests/qtest/fuzz/generic_fuzz_configs.h @@ -19,6 +19,16 @@ typedef struct generic_fuzz_config { gchar* (*argfunc)(void); /* Result must be freeable by g_free() */ } generic_fuzz_config; +static inline gchar *generic_fuzzer_virtio_9p_args(void){ + char tmpdir[] = "/tmp/qemu-fuzz.XXXXXX"; + g_assert_nonnull(mkdtemp(tmpdir)); + + return g_strdup_printf("-machine q35 -nodefaults " + "-device virtio-9p,fsdev=hshare,mount_tag=hshare " + "-fsdev local,id=hshare,path=%s,security_model=mapped-xattr," + "writeout=immediate,fmode=0600,dmode=0700", tmpdir); +} + const generic_fuzz_config predefined_configs[] = { { .name = "virtio-net-pci-slirp", @@ -60,6 +70,16 @@ const generic_fuzz_config predefined_configs[] = { .name = "virtio-mouse", .args = "-machine q35 -nodefaults -device virtio-mouse", .objects = "virtio*", + },{ + .name = "virtio-9p", + .argfunc = generic_fuzzer_virtio_9p_args, + .objects = "virtio*", + },{ + .name = "virtio-9p-synth", + .args = "-machine q35 -nodefaults " + "-device virtio-9p,fsdev=hshare,mount_tag=hshare " + "-fsdev synth,id=hshare", + .objects = "virtio*", },{ .name = "e1000", .args = "-M q35 -nodefaults "