git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 0/3] Add commit-graph fuzzer and fix buffer overflow

From
Josh Steadmon <steadmon@google.com>
Date
Dec 13, 2018, 19:43 UTC
Message-ID
<cover.1544729841.git.steadmon@google.com>
In-Reply-To
<cover.1544048946.git.steadmon@google.com>

Add a new fuzz test for the commit graph and fix a buffer read-overflow that it discovered. Additionally, fix the Makefile instructions for building fuzzers.

Changes since V3:
  * Improve portability of the new test functionality.
  * Fix broken &&-chains in tests.
Changes since V2:
  * Avoid pointer arithmetic overflow when checking the graph's chunk
    count.
  * Merge the corrupt_graph_and_verify and
    corrupt_and_zero_graph_then_verify test functions.
Josh Steadmon (3):
  commit-graph, fuzz: Add fuzzer for commit-graph
  commit-graph: fix buffer read-overflow
  Makefile: correct example fuzz build
 .gitignore              |  1 +
 Makefile                |  3 +-
 commit-graph.c          | 67 +++++++++++++++++++++++++++++------------
 commit-graph.h          |  3 ++
 fuzz-commit-graph.c     | 16 ++++++++++
 t/t5318-commit-graph.sh | 16 ++++++++--
 6 files changed, 83 insertions(+), 23 deletions(-)
 create mode 100644 fuzz-commit-graph.c
Range-diff against v3:
1:  675d58ecea ! 1:  80b5662f30 commit-graph: fix buffer read-overflow
    @@ -55,29 +55,26 @@
      	pos=$1
      	data="${2:-\0}"
      	grepstr=$3
    -+	orig_size=$(stat --format=%s $objdir/info/commit-graph)
    -+	zero_pos=${4:-${orig_size}}
    ++	orig_size=$(wc -c < $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 &&
    ++	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
    ++	grep -v "^+" test_err >err &&
      	test_i18ngrep "$grepstr" err
      }
      
    -+
    - test_expect_success 'detect bad signature' '
    - 	corrupt_graph_and_verify 0 "\0" \
    - 		"graph signature"
     @@
      		"incorrect checksum"
      '
      
     +test_expect_success 'detect incorrect chunk count' '
    -+	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\xff" \
    ++	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\377" \
     +		"chunk lookup table entry missing" $GRAPH_CHUNK_LOOKUP_OFFSET
     +'
     +
2:  06a32bfe8b = 2:  21101b961a Makefile: correct example fuzz build
-- 
2.20.0.rc2.10.g21101b961a
Previous: Josh SteadmonNext: Josh Steadmon
Message 25 of 50 in “Add commit-graph fuzzer and fix buffer overflow”
  1. 0/2 Add commit-graph fuzzer and fix buffer overflowJosh Steadmon, Dec 5, 2018
  2. 1/2 commit-graph, fuzz: Add fuzzer for commit-graphJosh Steadmon, Dec 5, 2018
  3. Ævar Arnfjörð BjarmasonDec 5, 2018
  4. Josh SteadmonDec 6, 2018
  5. Junio C HamanoDec 6, 2018
  6. Junio C HamanoDec 6, 2018
  7. Junio C HamanoDec 6, 2018
  8. 2/2 commit-graph: fix buffer read-overflowJosh Steadmon, Dec 5, 2018
  9. Derrick StoleeDec 6, 2018
  10. 0/3 Add commit-graph fuzzer and fix buffer overflowJosh Steadmon, Dec 6, 2018
  11. 1/3 commit-graph, fuzz: Add fuzzer for commit-graphJosh Steadmon, Dec 6, 2018
  12. 2/3 commit-graph: fix buffer read-overflowJosh Steadmon, Dec 6, 2018
  13. Jeff KingDec 7, 2018
  14. Derrick StoleeDec 7, 2018
  15. 3/3 Makefile: correct example fuzz buildJosh Steadmon, Dec 6, 2018
  16. 0/3 Add commit-graph fuzzer and fix buffer overflowJosh Steadmon, Dec 7, 2018
  17. 1/3 commit-graph, fuzz: Add fuzzer for commit-graphJosh Steadmon, Dec 7, 2018
  18. 2/3 commit-graph: fix buffer read-overflowJosh Steadmon, Dec 7, 2018
  19. Junio C HamanoDec 9, 2018
  20. SZEDER GáborDec 10, 2018
  21. Josh SteadmonDec 10, 2018
  22. Josh SteadmonDec 10, 2018
  23. Jeff KingDec 11, 2018
  24. 3/3 Makefile: correct example fuzz buildJosh Steadmon, Dec 7, 2018
  25. 0/3 Add commit-graph fuzzer and fix buffer overflowJosh Steadmon, Dec 13, 2018
  26. 1/3 commit-graph, fuzz: Add fuzzer for commit-graphJosh Steadmon, Dec 13, 2018
  27. 2/3 commit-graph: fix buffer read-overflowJosh Steadmon, Dec 13, 2018
  28. SZEDER GáborJan 12, 2019
  29. Josh SteadmonJan 15, 2019
  30. 3/3 Makefile: correct example fuzz buildJosh Steadmon, Dec 13, 2018
  31. Jeff KingDec 18, 2018
  32. Josh SteadmonDec 18, 2018
  33. Jeff KingDec 19, 2018
  34. Johannes SchindelinDec 20, 2018
  35. Jeff KingDec 20, 2018
  36. Junio C HamanoDec 26, 2018
  37. 0/3 Add commit-graph fuzzer and fix buffer overflowJosh Steadmon, Jan 15, 2019
  38. 1/3 commit-graph, fuzz: Add fuzzer for commit-graphJosh Steadmon, Jan 15, 2019
  39. Junio C HamanoJan 15, 2019
  40. 2/3 commit-graph: fix buffer read-overflowJosh Steadmon, Jan 15, 2019
  41. 3/3 Makefile: correct example fuzz buildJosh Steadmon, Jan 15, 2019
  42. Junio C HamanoJan 15, 2019
  43. Josh SteadmonJan 15, 2019
  44. Junio C HamanoJan 15, 2019
  45. 0/3 Add commit-graph fuzzer and fix buffer overflowJosh Steadmon, Jan 15, 2019
  46. 1/3 commit-graph, fuzz: Add fuzzer for commit-graphJosh Steadmon, Jan 15, 2019
  47. 2/3 commit-graph: fix buffer read-overflowJosh Steadmon, Jan 15, 2019
  48. Ævar Arnfjörð BjarmasonFeb 20, 2019
  49. SZEDER GáborFeb 20, 2019
  50. 3/3 Makefile: correct example fuzz buildJosh Steadmon, Jan 15, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.