From patchwork Fri Oct 23 15:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 270569 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, HK_RANDOM_FROM, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D33EC5DF9D for ; Fri, 23 Oct 2020 15:11:00 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5602822210 for ; Fri, 23 Oct 2020 15:10:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=bushare.onmicrosoft.com header.i=@bushare.onmicrosoft.com header.b="McN5WE6b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5602822210 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bu.edu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVyiX-0006Ke-R2 for qemu-devel@archiver.kernel.org; Fri, 23 Oct 2020 11:10:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVyfr-0003W1-K5 for qemu-devel@nongnu.org; Fri, 23 Oct 2020 11:08:11 -0400 Received: from mail-bn7nam10on2090.outbound.protection.outlook.com ([40.107.92.90]:50400 helo=NAM10-BN7-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 1kVyfp-000767-Ph for qemu-devel@nongnu.org; Fri, 23 Oct 2020 11:08:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IKh9wDHSH/mHjY7fkMNd6m3G1NMb6uV6kycC0hDpBUlPcJkhL4h/M5SJr1daWPsdpOCF5Prk21bfpBBaDQ1bJ8el8fv/f1HZ7PIdA9Pmiurxihpwn+fUiy51WQfdY83FjPfITe+rqpASBnLM7TkTYPWChmzdhYb7ndJ45g1j4bOmZPjf35vB2KU/yzaaxMbHDb4ZHZfeO52Ce7mGNWGyDTQA+rTBm+WQpT3TlTPBObThSbQSFWzjM1UURmc7bBXVOPRTmYnSJsrxJLKcVXBl60BhhAVZetsy7Is3FX8RKdkiSKp8GiAw8awKcYiKD0siMhHxWR1L6NaDhnnsa1p2VA== 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=9JConF3xBRqpbuFwEhD621vHq4kTf2LaXQ5y+kvYOsM=; b=Du1CfS+WHxe29VssebPfxiJoVUZxarKaGCMUumgruZO3inYSo7CR5Dd+MsF1rGB2pZaorcMaQ8lHjNnv1Mrc3+PUYqw8MNRGRna8c9oOfDYeQDDWOeH9Sy7GJfN16OxmabOTZyVuDgTUri7XocmWGrI+PMCIXOuPJ8uFLE9bEme3aUAxBZMGHYLLZ05AP9ww+cjlSgj+rpsT/sGyRxdZXcNFUWKurRSkR9/dPgsXv9WzyF0VyL+NhyEQp/U78iB5LUNFqRRWtYta3eSbX5dedap3v3k/4JKM9nnPogoMOBR79x4rBcRODvxY26M2algU4BpsfRVuWVxqmcUzfvEBbA== 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=9JConF3xBRqpbuFwEhD621vHq4kTf2LaXQ5y+kvYOsM=; b=McN5WE6bWKDkvnS+csq9WxV8C2CVOpYPNsW1P+fKYtlcxPJdjH/DchVw+kqFRDP/W38ytrmarhEZrpHy4vf9mTbzJYx6d0k9B4KWil6owC/JSRtRZnGWX1i+ODTP7os57btkUdzbV2HDZwJLb8fboBWH6XyTgPeUpk6jWXKj5N8= 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 SA0PR03MB5516.namprd03.prod.outlook.com (2603:10b6:806:bf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Fri, 23 Oct 2020 15:08:07 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::d520:4c19:8ce6:7db2]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::d520:4c19:8ce6:7db2%2]) with mapi id 15.20.3477.028; Fri, 23 Oct 2020 15:08:07 +0000 From: Alexander Bulekov To: qemu-devel@nongnu.org Subject: [PATCH v7 07/17] fuzz: Add support for custom crossover functions Date: Fri, 23 Oct 2020 11:07:36 -0400 Message-Id: <20201023150746.107063-8-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201023150746.107063-1-alxndr@bu.edu> References: <20201023150746.107063-1-alxndr@bu.edu> X-Originating-IP: [72.93.72.163] X-ClientProxiedBy: MN2PR01CA0065.prod.exchangelabs.com (2603:10b6:208:23f::34) 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.93.72.163) by MN2PR01CA0065.prod.exchangelabs.com (2603:10b6:208:23f::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Fri, 23 Oct 2020 15:08:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6fc1c726-e2c5-469b-ddfa-08d877657271 X-MS-TrafficTypeDiagnostic: SA0PR03MB5516: 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: GKirD1C0Eu3KLc7XlidxFXINw7oT3NmdX+2MtRQ7VWomdcstN4YPap12PCU5kgISjfJJ1HgiG0Z8yM6jWZHqx7QC8SSwJDo8k+6EusKA0mw5plvAuO+UNUxFKhKCOFNcU/wXvhAMyRe09LyyYp2yNjFf+fyDTG4CXWyHhkc9HPSJhWkULV/htYEwfH+dS9HzWNoBKWZdSwCgb4Dgjk32PkxalD6WOJyQ7oRtaTP7B4to7BGWdxLgjuZtpsAaAkIpk1Bxk3efOwDm5BHDzHx4//PNUXu7GUub6odcSdHDH5BgsJRTFXoZz+tT6a5j+BDFEk1dUheqOOfBU9fFU7J2Qg== 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)(366004)(396003)(136003)(346002)(39860400002)(376002)(2616005)(4326008)(1076003)(6512007)(478600001)(5660300002)(8936002)(8676002)(86362001)(2906002)(956004)(36756003)(6506007)(66476007)(6916009)(786003)(66556008)(75432002)(66946007)(52116002)(6666004)(186003)(26005)(6486002)(316002)(54906003)(16526019); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: KDVYZgxdBfRNy6EUBua4MIUt1uBFGv1It03JhvBZONJX7ReuXnnf/OCiiiuASpJhfsX9jgmrsP0qpwcjG+h8PJLGtiAQJ/UfvF3Z87ZHy+6PAAcS0Qfy2gXW1I9LRFQxEZVenEbGFsOWgbWG+kU+FNN5N7vfGB3NiNLxUHFGhL2j4+YKVOyB97LOYIaQ8VYopwKpbm1fvy+jUFeDX/g+eHwjrVmiplHOW2a4X/g1MagALvDhW2Gn7RkjlWcmP9QFnqfr5Daz0UYx9AdiOtwc3/f8TijAaJH+47J8UnCawfNyN1m9Tzt/g5uWUe9AOL/WN0by2jWwtbxn8CLKPMaNrDmU7gP3DsEm1mSAZNfTxu13Zj5+5rZkoSpLyQxv8ov1timypwODmd8FgrUtYa2Zo9VdlMj+vY1Qbd2eY+Ux8iBuGWjjW2mtnMEulCTCl44I48E+EyKMVLj5Qq9sLVstwlM6vI+VkzbAWoOVXM+m5tyJQWh10KWcITgJL4ZH/YXo9CHF8XWw2CmGa8mu7mNxs5VQjoOElVp95oOzvjV5uD4Qk1RDyUshzXrJT1acKBXAEJ64aUtYAZOOkutx3TmR/8kScvv5QlnTatZSqC//2TwVq9gtyvi337+EG4C961qVi7OS0stb4+4kWHExnVqCgg== X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 6fc1c726-e2c5-469b-ddfa-08d877657271 X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2020 15:08:06.9681 (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: C4+ifnoVyIxh8BNtbG28sBxMdf/+tOxl1w718FX5zFqHssLU0H69QZBYbt9xSzok X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5516 Received-SPF: pass client-ip=40.107.92.90; envelope-from=alxndr@bu.edu; helo=NAM10-BN7-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 11:08:06 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.63, 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 , thuth@redhat.com, Alexander Bulekov , f4bug@amsat.org, darren.kenny@oracle.com, bsd@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, dimastep@yandex-team.ru Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" libfuzzer supports a "custom crossover function". Libfuzzer often tries to blend two inputs to create a new interesting input. Sometimes, we have a better idea about how to blend inputs together. This change allows fuzzers to specify a custom function for blending two inputs together. Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny --- tests/qtest/fuzz/fuzz.c | 13 +++++++++++++ tests/qtest/fuzz/fuzz.h | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index eb0070437f..7be7226bc0 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -118,6 +118,19 @@ static FuzzTarget *fuzz_get_target(char* name) } +/* Sometimes called by libfuzzer to mutate two inputs into one */ +size_t LLVMFuzzerCustomCrossOver(const uint8_t *data1, size_t size1, + const uint8_t *data2, size_t size2, + uint8_t *out, size_t max_out_size, + unsigned int seed) +{ + if (fuzz_target->crossover) { + return fuzz_target->crossover(data1, size1, data2, size2, out, + max_out_size, seed); + } + return 0; +} + /* Executed for each fuzzing-input */ int LLVMFuzzerTestOneInput(const unsigned char *Data, size_t Size) { diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h index 8eb765edc8..ed9ce17154 100644 --- a/tests/qtest/fuzz/fuzz.h +++ b/tests/qtest/fuzz/fuzz.h @@ -77,6 +77,29 @@ typedef struct FuzzTarget { */ void(*fuzz)(QTestState *, const unsigned char *, size_t); + /* + * The fuzzer can specify a "Custom Crossover" function for combining two + * inputs from the corpus. This function is sometimes called by libfuzzer + * when mutating inputs. + * + * data1: location of first input + * size1: length of first input + * data1: location of second input + * size1: length of second input + * out: where to place the resulting, mutated input + * max_out_size: the maximum length of the input that can be placed in out + * seed: the seed that should be used to make mutations deterministic, when + * needed + * + * See libfuzzer's LLVMFuzzerCustomCrossOver API for more info. + * + * Can be NULL + */ + size_t(*crossover)(const uint8_t *data1, size_t size1, + const uint8_t *data2, size_t size2, + uint8_t *out, size_t max_out_size, + unsigned int seed); + } FuzzTarget; void flush_events(QTestState *); @@ -91,6 +114,10 @@ void fuzz_qtest_set_serialize(bool option); */ void fuzz_add_target(const FuzzTarget *target); +size_t LLVMFuzzerCustomCrossOver(const uint8_t *data1, size_t size1, + const uint8_t *data2, size_t size2, + uint8_t *out, size_t max_out_size, + unsigned int seed); int LLVMFuzzerTestOneInput(const unsigned char *Data, size_t Size); int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp);