From patchwork Tue Jan 15 22:25:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 10765201 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 83AA86C5 for ; Tue, 15 Jan 2019 22:26:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7380F2D3F5 for ; Tue, 15 Jan 2019 22:26:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67D9C2DF86; Tue, 15 Jan 2019 22:26:02 +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 DB2142D3F5 for ; Tue, 15 Jan 2019 22:26:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390767AbfAOW0A (ORCPT ); Tue, 15 Jan 2019 17:26:00 -0500 Received: from mail-qt1-f201.google.com ([209.85.160.201]:44149 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727036AbfAOW0A (ORCPT ); Tue, 15 Jan 2019 17:26:00 -0500 Received: by mail-qt1-f201.google.com with SMTP id j5so3815504qtk.11 for ; Tue, 15 Jan 2019 14:25:59 -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=e0D2Q7gcDzj/gGaRh2cnHSQqOs2IqVFMwSdW//a6iio=; b=TQ7i2JW5pXm5CwHDPwgnMwcY78TVOKspXaKuB/rY+4I8/F/HWvTjUl3Vf/IHRsdZX7 /rIKF2OoLsEsz/zEez4Wkj+8g3s2CbAg2DLty34P+m9krgtzwXfs+1bPI6sCyEupEDkR LY94tx04J4bXI+d1xmeLLBONWpsPbxDAZDGHhCwWgSi/qGsW6bS0HJ9/WALfGeGImIcI GyN0+214rvcUI4tCi/EyfgvNCZwQyP7aYrX7dnXTtC5vNjq5rUL1G/ishSSjpdb9fGZj wcjYvLYXdQo5+WPdnRyXi+usT+Da9gQ+XR6FfmSdUeA+Rsr9qpnTSVUoDiK7KdGoe1WF 3NDg== 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=e0D2Q7gcDzj/gGaRh2cnHSQqOs2IqVFMwSdW//a6iio=; b=kTQBT/0KG9yuejNNWXiRZx6z3yaV/E5FY7g045mbJQi7o1ldoBzfiE8OdMHAJJTHkB 7zXTPQUnERs8ZaJCh/VJnFTAnifuF+cjkII/WquYVVO4IjGu/LDk5xG9AzDGcx1ZnGzr vK9YT+rAkE8cXnAkE4y9/un/4Uhj2Dbo+OGC7CBZZwIvn4U+oXO2EQAfc9DQ+Q4XhYV0 iBqiSpzI3iU2mwaHAIq9mkNm6Uw3uzPdpE2kBLWNF4D4C6p8JuKL26UGGDR3AtmXo6nK +hklmJ2TJ/6tmI52ZWdbJ1M/O8e5/s3mc2UeFfKFM6fVOT7VWy0UMjkGX6VVJgYP64qX tVSQ== X-Gm-Message-State: AJcUuken7aUTyQRGwlsPdxFeEy7SPszAeNwyGAL7Ct3iP60K/k4Zrn6R F7qnH3lS3Xz8JgzS7jbf8B6tmzYASzXa267EzH0xvb8bs/oMVghV42U7y/x9r/0G4z8CEmBiQBf 1+8u7AG7JU5xbAyRtqLWvDCdORajbSKOMfQZt3AC2UkKzAsZ63/yFXAa2TOA3paM= X-Google-Smtp-Source: ALg8bN7s79YMvuMuZ3KY+S03CpShKfYkVEcTUySMxtQezYyMqMbBFuMU0VuuzpCy1grWQgwC7dybycAFW6yhQg== X-Received: by 2002:ac8:3364:: with SMTP id u33mr3439585qta.56.1547591159208; Tue, 15 Jan 2019 14:25:59 -0800 (PST) Date: Tue, 15 Jan 2019 14:25:50 -0800 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog Subject: [PATCH v6 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, szeder.dev@gmail.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Break 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 Tue Jan 15 22:25:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 10765203 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 086F91390 for ; Tue, 15 Jan 2019 22:26:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED1402D3F5 for ; Tue, 15 Jan 2019 22:26:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E14292DF86; Tue, 15 Jan 2019 22:26:05 +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 CAC502D3F5 for ; Tue, 15 Jan 2019 22:26:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390798AbfAOW0D (ORCPT ); Tue, 15 Jan 2019 17:26:03 -0500 Received: from mail-vs1-f74.google.com ([209.85.217.74]:47302 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727036AbfAOW0D (ORCPT ); Tue, 15 Jan 2019 17:26:03 -0500 Received: by mail-vs1-f74.google.com with SMTP id y139so1753209vsc.14 for ; Tue, 15 Jan 2019 14:26:02 -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=6cfjX7Ggbruq9E+yfb0LYt3QVSTgNYC/7OZKcyJ5FdY=; b=mlwpEhQouzKSAeN3pSG/fp+WEBeYnKVFFLJPJwsF86O2t8A20Wz6eRCoWAM6lymbBX Cp6oJbD2FutZIe8tpXpYBFng9RB5tMwNiD/H1uJeIkX00RCki1OIzDEeE+2dAW4QypsB vp7m0sBY8xmGwFKhWqTT52KGHwYLk8ID6JCYxm71tUdbayOvRzZ9Sc1WZDSHBHfixpvG c4iw4jTjb/BHLq6QvcfG4aGQG5kfmfGurzEt5QSGAb5cOPKqDssCEGNEVBetC5aE+x8h 6RXHcyPX/GU3L66gBcwjtl9yn0CJ/11rHr6YSsvrd/Q7nQ5Vc2rMY2sz+sFykT+kLYND hl2w== 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=6cfjX7Ggbruq9E+yfb0LYt3QVSTgNYC/7OZKcyJ5FdY=; b=rLH+pvUgxUty8CiC90BW0U5GlhXNShJWtvo0/lQRes6fzUdTQcH8EOLhDGal+ulI/3 B+ISYYIo+4myLokJz5kFCD4AwRLZCupLvNuAwhIdtKZL6sv1HTUqPFxvrmuucV0VMcv9 e4C5X8O1B07SsqQyZl3MUb+CKfaSgNmi6BOCxdr8jomLORrUUAb1XZLR7w3F0KZC9mn5 uNkHbw8AYycG+0RKuyPi36WvTWgKnWQNYe8cRap7N+MLULWxjHn94CNc9kInzz7TMi89 begfxhiJT2jWGx22WZooOh2n8cxuqH1LdnMgIpJ4kyovuI8MQK7ddBbq8AAxo65bqq29 gIMQ== X-Gm-Message-State: AJcUukeIciVR+qIEEXKwGKkhYLRDmY/jiPCJJzwAMtifcaHwKuLaF5B7 0TbvBceCyACMgZggdd+QretOkGCehr6fgIHIIS9dFQpcrOctLqmXmIK80U+3AVjozgXyf8hOkeu MMh86SNxrDc7Te8j5hAw+Ujv1dGiyLzJR+OmlT7ZQIl5rMK70noNV2qYvOoLn96M= X-Google-Smtp-Source: ALg8bN4E8z6QwERu0zDNeMoFDBPa+mah1odx7IgJ368sjASOXr6zKOR9Z8ab4fv1pSw2OdP7tQSl+oZ4EKLbfQ== X-Received: by 2002:a67:4e47:: with SMTP id c68mr4039663vsb.15.1547591162208; Tue, 15 Jan 2019 14:26:02 -0800 (PST) Date: Tue, 15 Jan 2019 14:25:51 -0800 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog Subject: [PATCH v6 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, szeder.dev@gmail.com 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 | 16 +++++++++++++--- 2 files changed, 25 insertions(+), 5 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..694f26079f 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -366,9 +366,10 @@ 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() { @@ -376,11 +377,15 @@ corrupt_graph_and_verify() { data="${2:-\0}" grepstr=$3 cd "$TRASH_DIRECTORY/full" && + orig_size=$(wc -c < $objdir/info/commit-graph) && + zero_pos=${4:-${orig_size}} && 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 && + dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" count=0 && + dd if=/dev/zero of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" count=$(($orig_size - $zero_pos)) && test_must_fail git commit-graph verify 2>test_err && - grep -v "^+" test_err >err + grep -v "^+" test_err >err && test_i18ngrep "$grepstr" err } @@ -484,6 +489,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 "\377" \ + "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 Tue Jan 15 22:25:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 10765205 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 0497F1390 for ; Tue, 15 Jan 2019 22:26:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8F2A2D3F5 for ; Tue, 15 Jan 2019 22:26:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD1322DF86; Tue, 15 Jan 2019 22:26:07 +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 950452D3F5 for ; Tue, 15 Jan 2019 22:26:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390814AbfAOW0G (ORCPT ); Tue, 15 Jan 2019 17:26:06 -0500 Received: from mail-oi1-f201.google.com ([209.85.167.201]:43207 "EHLO mail-oi1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390802AbfAOW0F (ORCPT ); Tue, 15 Jan 2019 17:26:05 -0500 Received: by mail-oi1-f201.google.com with SMTP id p131so1786114oig.10 for ; Tue, 15 Jan 2019 14:26:05 -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=ht+oEmjGiRV6RDSOJsCNl2CyL2aJq2sNHW+/Snk8ZRI=; b=LOmOidOwhpe7KxuuYfFIUg0Cdr18t5TvwSFYtov16DVQ3EEIHhYxTan3IwnZZOsfEX Z6G6otaAIjxncQ0FrevvPFzB8Wvuv3KIDT88BhafgdgXPIFS22hLJGhIbKRcjXId9Wfw GLa6dA3YUHWgEC2TxYWRMb/MbCrJBUE3YeBVplQQL/GXkFWVC6CIJWVgUINcC8DLSC9F tlwDUp1a08XYY72EPe3tb/DVRzNqOZN8pgE36+h+vTdgp8jd707Ex2Q+QZgGuzOVL+m/ MfS2NFh6FZvcxWWe5YyOQC3H1bbIB2I0IuOltTudK89t7PRXITlSCIvmYAshUHI3w0HN ho7Q== 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=ht+oEmjGiRV6RDSOJsCNl2CyL2aJq2sNHW+/Snk8ZRI=; b=U8BNsRF6VwGNTQbuEcyz0H7GpYouqr3YcogQDasGVq9smWXlbd25UOza9PS6QQn4w1 EMuM7BeOjyHLs0TxQwMtQgd/3Gkc3XJPNhECnEt1ik74U59762BEIvjgzTPSoOIIwwwM QSsKr++rLabBdf4hdwj9iG0O7NjxaKUFW+4lzip72t0rf1UbUKFgL46XteyhQ5hhN0Rk NufvJDk9R8rVLSIkmQgcxytewNm4rArETvuYxQRrRMF34cnE0f6HO3O5U5htWKWlahyF HJcLWMtil++5dVJvtnsK6ISz1a2gukkMruDBbaYgDGjQjq3N8tvMWhGxzJ9GMoShhFOf IcWw== X-Gm-Message-State: AJcUukcWyruQ3FQf4dGU1upRZ8Yo5TwNkiOKRLnggaYAbrJY9rUOjF2u zNyzMnR/cAM7QZVfM8mhh5ZxK4NNtJE6Ut8vUJQxi8E2vCRJ7+JIRPpyuTIvA2Lc13kJ7WjkeXJ SMXfoBgIbVONxo75elXuw6d6VUWmcsRKUU45KJ1ycEnW3yee9Tb6VxUHzm+dwqGw= X-Google-Smtp-Source: ALg8bN5FmhHxZbtRpJYrEmAG5x03DAiPV1XOCRFyDCHhAj0SkWlalHWqEj2gPPSU775ZYJo54vcMacXdRPnlFA== X-Received: by 2002:a9d:7406:: with SMTP id n6mr3553205otk.65.1547591164825; Tue, 15 Jan 2019 14:26:04 -0800 (PST) Date: Tue, 15 Jan 2019 14:25:52 -0800 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog Subject: [PATCH v6 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, szeder.dev@gmail.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The comment explaining how to build the fuzzers was broken in 927c77e7d4d ("Makefile: use FUZZ_CXXFLAGS for linking fuzzers", 2018-11-14). When building fuzzers, all .c files must be compiled with coverage tracing enabled. This is not possible when using only FUZZ_CXXFLAGS, as that flag is only applied to the fuzzers themselves. Switching back to CFLAGS fixes the issue. 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 #