From patchwork Fri Dec 7 22:27:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 10718939 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8920E1750 for ; Fri, 7 Dec 2018 22:27:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 786F52DA7C for ; Fri, 7 Dec 2018 22:27:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C8C82F73E; Fri, 7 Dec 2018 22:27:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAD672DA7C for ; Fri, 7 Dec 2018 22:27:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726113AbeLGW1b (ORCPT ); Fri, 7 Dec 2018 17:27:31 -0500 Received: from mail-pg1-f202.google.com ([209.85.215.202]:48714 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726041AbeLGW1a (ORCPT ); Fri, 7 Dec 2018 17:27:30 -0500 Received: by mail-pg1-f202.google.com with SMTP id r16so3526230pgr.15 for ; Fri, 07 Dec 2018 14:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=fUuaWZ9uILJ9U3kozA7uwqoXi2bGUMszdd9WsCZFdQk=; b=rVNQoLMk0cL3nUGoc+PfXxS7l6TwvjDDXJusGK87ccVOrwI6GTH0LPgBncJ3ctBcHy RQFPsLTvMX2Of0oI4D3oOdMf9Zw76ktmAu/evgsFRunfNwbjEfiZsilrWix86yR1Ld/l W1cMplK1hYtD6k2Y2XlOoNsHrVOziS1MLyRztY0g6cz9nHiZ5MB7psm3My21GQM9zYFJ AcI2mAbTsexIbA1SNg7t44oF5RNH0WjAgNrym82f2ipyNUK5jj/gN5Aa9Pq316vKIgsw MZVDZm6I5eYqbD9o/ZaKU6vB3Dq/WffK0whTI2sFdXo5CUWMplInjfHt0dKVhMPMpu84 P6Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=fUuaWZ9uILJ9U3kozA7uwqoXi2bGUMszdd9WsCZFdQk=; b=EX9iS9h06bBGspOmxsmpQ/cbSzg3YDUFz8tH8I+Sp4/tLmIlWgluZvAr5tGwYszQnJ uAxY6WcOJJhUYYQMiXR3oECSiRE9429FKi9WwTHevVw7MBt3b1KF9ZXAgqdTFGU+LCNr 2dAyG4dE0787VS7c0qfvYxuZYyrkyT4SplNeMhhUW1Pw2cK/viknS3NqK+b7w1jeOyhJ xUP2udNbW7em3Cn1ZKhegleegofehwClkKEOoRzVP3H9oQrwedlscSSEHQwniWVYeuGM x5M9xDBNWQ7TLxbnkfhlWFEHQq1SzBYZuQs34HjcgZd5kPU8iG/tLkwN3nmQtyB6DsVo 63hA== X-Gm-Message-State: AA+aEWbVnyXOEoHvLdBeceLOndPhtTZ1H6Qiky+TruLTF45oVqEEFXZj 4q9HJml5v972Ub3/qekpaDlc4qBQwkIvT6w9fZKrwkAVP0WuT0Bms+LbrzpSLGiXDX0z2GNsIGF 2GWxq/rT8+DXtnTNDKlRyaCSrhM+/BcG94cGfEv4j4aa/R6Pq3Jc6IUXFGa4QP1c= X-Google-Smtp-Source: AFSGD/UqEWHL/gME1/fMyGQb/7LtkHfI/4CackTh5MlY0LvjRZKNVx4YyFmQaJAl+18+is6yVQ1UPhAbEIHuew== X-Received: by 2002:a63:da56:: with SMTP id l22mr2017069pgj.6.1544221649731; Fri, 07 Dec 2018 14:27:29 -0800 (PST) Date: Fri, 7 Dec 2018 14:27:22 -0800 In-Reply-To: Message-Id: <0b57ecbe1b6c72d95311ba1bb30ea1ed9fd7e3e5.1544221121.git.steadmon@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog Subject: [PATCH v3 1/3] commit-graph, fuzz: Add fuzzer for commit-graph From: Josh Steadmon To: git@vger.kernel.org Cc: gitster@pobox.com, stolee@gmail.com, avarab@gmail.com, peff@peff.net Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Breaks load_commit_graph_one() into a new function, parse_commit_graph(). The latter function operates on arbitrary buffers, which makes it suitable as a fuzzing target. Since parse_commit_graph() is only called by load_commit_graph_one() (and the fuzzer described below), we omit error messages that would be duplicated by the caller. Adds fuzz-commit-graph.c, which provides a fuzzing entry point compatible with libFuzzer (and possibly other fuzzing engines). Signed-off-by: Josh Steadmon --- .gitignore | 1 + Makefile | 1 + commit-graph.c | 53 ++++++++++++++++++++++++++++++--------------- commit-graph.h | 3 +++ fuzz-commit-graph.c | 16 ++++++++++++++ 5 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 fuzz-commit-graph.c diff --git a/.gitignore b/.gitignore index 0d77ea5894..8bcf153ed9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/fuzz-commit-graph /fuzz_corpora /fuzz-pack-headers /fuzz-pack-idx diff --git a/Makefile b/Makefile index 1a44c811aa..6b72f37c29 100644 --- a/Makefile +++ b/Makefile @@ -684,6 +684,7 @@ SCRIPTS = $(SCRIPT_SH_INS) \ ETAGS_TARGET = TAGS +FUZZ_OBJS += fuzz-commit-graph.o FUZZ_OBJS += fuzz-pack-headers.o FUZZ_OBJS += fuzz-pack-idx.o diff --git a/commit-graph.c b/commit-graph.c index 40c855f185..07dd410f3c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -84,16 +84,10 @@ static int commit_graph_compatible(struct repository *r) struct commit_graph *load_commit_graph_one(const char *graph_file) { void *graph_map; - const unsigned char *data, *chunk_lookup; size_t graph_size; struct stat st; - uint32_t i; - struct commit_graph *graph; + struct commit_graph *ret; int fd = git_open(graph_file); - uint64_t last_chunk_offset; - uint32_t last_chunk_id; - uint32_t graph_signature; - unsigned char graph_version, hash_version; if (fd < 0) return NULL; @@ -108,27 +102,55 @@ struct commit_graph *load_commit_graph_one(const char *graph_file) die(_("graph file %s is too small"), graph_file); } graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0); + ret = parse_commit_graph(graph_map, fd, graph_size); + + if (!ret) { + munmap(graph_map, graph_size); + close(fd); + exit(1); + } + + return ret; +} + +struct commit_graph *parse_commit_graph(void *graph_map, int fd, + size_t graph_size) +{ + const unsigned char *data, *chunk_lookup; + uint32_t i; + struct commit_graph *graph; + uint64_t last_chunk_offset; + uint32_t last_chunk_id; + uint32_t graph_signature; + unsigned char graph_version, hash_version; + + if (!graph_map) + return NULL; + + if (graph_size < GRAPH_MIN_SIZE) + return NULL; + data = (const unsigned char *)graph_map; graph_signature = get_be32(data); if (graph_signature != GRAPH_SIGNATURE) { error(_("graph signature %X does not match signature %X"), graph_signature, GRAPH_SIGNATURE); - goto cleanup_fail; + return NULL; } graph_version = *(unsigned char*)(data + 4); if (graph_version != GRAPH_VERSION) { error(_("graph version %X does not match version %X"), graph_version, GRAPH_VERSION); - goto cleanup_fail; + return NULL; } hash_version = *(unsigned char*)(data + 5); if (hash_version != GRAPH_OID_VERSION) { error(_("hash version %X does not match version %X"), hash_version, GRAPH_OID_VERSION); - goto cleanup_fail; + return NULL; } graph = alloc_commit_graph(); @@ -152,7 +174,8 @@ struct commit_graph *load_commit_graph_one(const char *graph_file) if (chunk_offset > graph_size - GIT_MAX_RAWSZ) { error(_("improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32), (uint32_t)chunk_offset); - goto cleanup_fail; + free(graph); + return NULL; } switch (chunk_id) { @@ -187,7 +210,8 @@ struct commit_graph *load_commit_graph_one(const char *graph_file) if (chunk_repeated) { error(_("chunk id %08x appears multiple times"), chunk_id); - goto cleanup_fail; + free(graph); + return NULL; } if (last_chunk_id == GRAPH_CHUNKID_OIDLOOKUP) @@ -201,11 +225,6 @@ struct commit_graph *load_commit_graph_one(const char *graph_file) } return graph; - -cleanup_fail: - munmap(graph_map, graph_size); - close(fd); - exit(1); } static void prepare_commit_graph_one(struct repository *r, const char *obj_dir) diff --git a/commit-graph.h b/commit-graph.h index 9db40b4d3a..813e7c19f1 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -54,6 +54,9 @@ struct commit_graph { struct commit_graph *load_commit_graph_one(const char *graph_file); +struct commit_graph *parse_commit_graph(void *graph_map, int fd, + size_t graph_size); + /* * Return 1 if and only if the repository has a commit-graph * file and generation numbers are computed in that file. diff --git a/fuzz-commit-graph.c b/fuzz-commit-graph.c new file mode 100644 index 0000000000..cf790c9d04 --- /dev/null +++ b/fuzz-commit-graph.c @@ -0,0 +1,16 @@ +#include "commit-graph.h" + +struct commit_graph *parse_commit_graph(void *graph_map, int fd, + size_t graph_size); + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + struct commit_graph *g; + + g = parse_commit_graph((void *)data, -1, size); + free(g); + + return 0; +} From patchwork Fri Dec 7 22:27:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 10718941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59A7A1750 for ; Fri, 7 Dec 2018 22:27:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B3362DA7C for ; Fri, 7 Dec 2018 22:27:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FEE72F73E; Fri, 7 Dec 2018 22:27:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F1B22DA7C for ; Fri, 7 Dec 2018 22:27:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726120AbeLGW1e (ORCPT ); Fri, 7 Dec 2018 17:27:34 -0500 Received: from mail-vs1-f74.google.com ([209.85.217.74]:46346 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726041AbeLGW1d (ORCPT ); Fri, 7 Dec 2018 17:27:33 -0500 Received: by mail-vs1-f74.google.com with SMTP id n87so2359872vsi.13 for ; Fri, 07 Dec 2018 14:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=T3yI6/FfKnxYgPaPoMsgjKDMp6ZxidATF6ygsXVRuAw=; b=I7xSCFPNzZS6HkaueHGVViF/8jNaGWkf7WmQqhtD1rJyHTPSZ3tBrVJTNEcooLo035 Id0Gb3QmKqCvnpu2NqR3dF/6bge6LnqwU7ph66ckzFt3nBbtZQU2R9//ftcIdWpsZzSk UxsaO9wzxcPY8UNsO/jhD51nsJlwcWeuPOgUkvtr/z7L2eppQZBBPXjFOBVQXUR/rsPc NucKwDBW6lU6ZO7r9R59PHWDr6JYjrY1PMa5ZO1KwPji/DLHM287ckAS8jxaQBLjVrEZ tyU+++8+B5l8mjqLZ1iUsLnLklB+Y3hC3i80HbUaWUA6oRfqwxpwEdQuLrF3Kw4qHGoX 9WMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=T3yI6/FfKnxYgPaPoMsgjKDMp6ZxidATF6ygsXVRuAw=; b=iec2l31iPnDDGw9D5Udh+WWwpgpNgB+EkMxFKIoTgw7z/eXdB2YzEDockwGIXVm82P P1749zBh6yTOpdfZ585aMmJz8X3kDzfjg6DcspLDT232V2Menpxq5P74okFpz7FWNcWW 0QqWe12p+f9DNQ4CzHIu1ILo5MfBiIWLms0w110apo+7A88Ig4tb8I4ocWoA3SwFoudC 8qhfP7/6iFIT31mUukBfGeQd20ayeEkvlXaDQZLY5+1Ogs+EH9D9uwB2ZY9Vbmqx4+we Uaiuyku5N0EC5o6wdqCfblFgsqwp6TflOn+vW3+mtOugboM4jGqBiP+ye+mtd3VwNtze Jopg== X-Gm-Message-State: AA+aEWbjHUJac+RwoyVKlnygU745aZe2L8nAlZEoA4gomuJqQXPOHfiS tZ42KHvDyHdjC2GI3fb5xYveYv2WKJoCspYKb6vmLbwGiI8dMtOut0RyuFOvo5LwHK/OGlarGgy W046GPr+ot63wOSVouTPzi9z83SaAlksyZjI3R/k5GkWSX6ppgfsyXOvgqJsGo6g= X-Google-Smtp-Source: AFSGD/WFynXkg5YUprD1ZNHLMZ7jXlDmPZkpugHrpEXlHTJUHaDWLXGVx0aiOzwnSdwbkeGjMRQTWsu4sEumhw== X-Received: by 2002:ab0:6617:: with SMTP id r23mr3352730uam.20.1544221652282; Fri, 07 Dec 2018 14:27:32 -0800 (PST) Date: Fri, 7 Dec 2018 14:27:23 -0800 In-Reply-To: Message-Id: <675d58ecea2f315bd05d2a21f6a473e9de1105a0.1544221121.git.steadmon@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog Subject: [PATCH v3 2/3] commit-graph: fix buffer read-overflow From: Josh Steadmon To: git@vger.kernel.org Cc: gitster@pobox.com, stolee@gmail.com, avarab@gmail.com, peff@peff.net Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP fuzz-commit-graph identified a case where Git will read past the end of a buffer containing a commit graph if the graph's header has an incorrect chunk count. A simple bounds check in parse_commit_graph() prevents this. Signed-off-by: Josh Steadmon --- commit-graph.c | 14 ++++++++++++-- t/t5318-commit-graph.sh | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index 07dd410f3c..836d65a1d3 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -165,10 +165,20 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, last_chunk_offset = 8; chunk_lookup = data + 8; for (i = 0; i < graph->num_chunks; i++) { - uint32_t chunk_id = get_be32(chunk_lookup + 0); - uint64_t chunk_offset = get_be64(chunk_lookup + 4); + uint32_t chunk_id; + uint64_t chunk_offset; int chunk_repeated = 0; + if (data + graph_size - chunk_lookup < + GRAPH_CHUNKLOOKUP_WIDTH) { + error(_("chunk lookup table entry missing; graph file may be incomplete")); + free(graph); + return NULL; + } + + chunk_id = get_be32(chunk_lookup + 0); + chunk_offset = get_be64(chunk_lookup + 4); + chunk_lookup += GRAPH_CHUNKLOOKUP_WIDTH; if (chunk_offset > graph_size - GIT_MAX_RAWSZ) { diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index 5fe21db99f..5b6b44b78e 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -366,24 +366,30 @@ GRAPH_OCTOPUS_DATA_OFFSET=$(($GRAPH_COMMIT_DATA_OFFSET + \ GRAPH_BYTE_OCTOPUS=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4)) GRAPH_BYTE_FOOTER=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4 * $NUM_OCTOPUS_EDGES)) -# usage: corrupt_graph_and_verify +# usage: corrupt_graph_and_verify [] # Manipulates the commit-graph file at the position -# by inserting the data, then runs 'git commit-graph verify' +# by inserting the data, optionally zeroing the file +# starting at , then runs 'git commit-graph verify' # and places the output in the file 'err'. Test 'err' for # the given string. corrupt_graph_and_verify() { pos=$1 data="${2:-\0}" grepstr=$3 + orig_size=$(stat --format=%s $objdir/info/commit-graph) + zero_pos=${4:-${orig_size}} cd "$TRASH_DIRECTORY/full" && test_when_finished mv commit-graph-backup $objdir/info/commit-graph && cp $objdir/info/commit-graph commit-graph-backup && printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc && + truncate --size=$zero_pos $objdir/info/commit-graph && + truncate --size=$orig_size $objdir/info/commit-graph && test_must_fail git commit-graph verify 2>test_err && grep -v "^+" test_err >err test_i18ngrep "$grepstr" err } + test_expect_success 'detect bad signature' ' corrupt_graph_and_verify 0 "\0" \ "graph signature" @@ -484,6 +490,11 @@ test_expect_success 'detect invalid checksum hash' ' "incorrect checksum" ' +test_expect_success 'detect incorrect chunk count' ' + corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\xff" \ + "chunk lookup table entry missing" $GRAPH_CHUNK_LOOKUP_OFFSET +' + test_expect_success 'git fsck (checks commit-graph)' ' cd "$TRASH_DIRECTORY/full" && git fsck && From patchwork Fri Dec 7 22:27:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 10718943 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ACF941750 for ; Fri, 7 Dec 2018 22:27:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D2B52DA7C for ; Fri, 7 Dec 2018 22:27:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91D0E2F73E; Fri, 7 Dec 2018 22:27:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 230752DA7C for ; Fri, 7 Dec 2018 22:27:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726126AbeLGW1h (ORCPT ); Fri, 7 Dec 2018 17:27:37 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:53042 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726041AbeLGW1f (ORCPT ); Fri, 7 Dec 2018 17:27:35 -0500 Received: by mail-pf1-f202.google.com with SMTP id q63so4512826pfi.19 for ; Fri, 07 Dec 2018 14:27:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=N9IBtPufJ2jZxUes8Y8kY5fx6zKd1WuqEcYPTtwzVCg=; b=QHPANA3HgXB53XrUtDjoB3Q7864ScQKegFYZjVHzrOUWr0oxTp9hRLcYzF69frRcVC 4HkwWMADwALoIxDql70AtZUhVtHnhxzChQ75HLC6a4dohmNu4oY8uWLIvwMKgDnw3/PF B/HHn/wQCxq90ZUEiYN7ehNGMhub6yy4HZs6giF8GK/vcTN9Ip9G82BPQ3LPMr5fTc12 ZBk6pNiqBciehVW3lOD2M0Cg9rhzFVEpCTgyTFC10/nz+Bu0OgPzAJS47ycTXmdhtMff PyXMDthH27A6X61eVdOHtDq8kwfW/2lUu3PnlqOarF9Gj120AbCxyiYi5JiL9oCD8oCb OhwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=N9IBtPufJ2jZxUes8Y8kY5fx6zKd1WuqEcYPTtwzVCg=; b=R7S/H6v9xoZeFHgp6J6TpB8FitaZ6kXgEYApuCeWf7/ZK5bMAzS2Iv5uXZ8XDEdhAC q5/bFYImMeEsoWUE+AtQteuxGIicXS5WElXHb+P973AkXIU8z27y2ZYTUSWQ188LoN+5 iALL+Wyh5nbsFsoZrCKw1sUs5/b0SkbiZeYjfQ0fjzNzG8zYfqzEzno2Jkiqj/LfbN2N L5tpfPeXyoQFhRk2dSCkV6Z8bizkHuizBa8o/87IKq0zDj/+TZUzbLabneErCWliPKKu WrYan8+6K4UU1IPMIOXx+SU9LoCFXflNzM7gCCU+phKpKdaeK4m9Nd/5oe95lsl9qr0W IxEA== X-Gm-Message-State: AA+aEWYj50fFum/OrjULGRBwCj1xj5MSw9We8YdVBAbdc1myBCDCNpib uFNOsK/Z9WSU8Eun5xSpAER9IlzQD5RjvaCX53K3YZv6RzhZ0//lIr7OhiJZVtWDeKnnfPxIkZs X08gfk9Mkr57HwdUVw1XJW9wu6X51NebA279ODRBpoTLpZ8m1JTl2+o5oUWlpMY4= X-Google-Smtp-Source: AFSGD/UleaEGwKQidNbTzKOkVLElvcGTuPI/dPq6nZavtpKsfK1t4dKjUFYEBu+Clbg3V20cU4mrnrQ88WTfQw== X-Received: by 2002:a62:39d8:: with SMTP id u85mr1986514pfj.116.1544221654484; Fri, 07 Dec 2018 14:27:34 -0800 (PST) Date: Fri, 7 Dec 2018 14:27:24 -0800 In-Reply-To: Message-Id: <06a32bfe8bcde47ede70f2447477803964fbc284.1544221121.git.steadmon@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog Subject: [PATCH v3 3/3] Makefile: correct example fuzz build From: Josh Steadmon To: git@vger.kernel.org Cc: gitster@pobox.com, stolee@gmail.com, avarab@gmail.com, peff@peff.net Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Josh Steadmon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6b72f37c29..bbcfc2bc9f 100644 --- a/Makefile +++ b/Makefile @@ -3104,7 +3104,7 @@ cover_db_html: cover_db # An example command to build against libFuzzer from LLVM 4.0.0: # # make CC=clang CXX=clang++ \ -# FUZZ_CXXFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \ +# CFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \ # LIB_FUZZING_ENGINE=/usr/lib/llvm-4.0/lib/libFuzzer.a \ # fuzz-all #