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

Re: [PATCH v4 2/3] commit-graph: fix buffer read-overflow

From
Josh Steadmon <steadmon@google.com>
Date
Jan 15, 2019, 19:58 UTC
Message-ID
<20190115195808.GA35794@google.com>
In-Reply-To
<20190112105757.GE840@szeder.dev>
On 2019.01.12 11:57, SZEDER Gábor wrote:
Show 36 quoted lines
> On Thu, Dec 13, 2018 at 11:43:57AM -0800, Josh Steadmon wrote:
> > diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
> > index 5fe21db99f..a1b5a75882 100755
> > --- a/t/t5318-commit-graph.sh
> > +++ b/t/t5318-commit-graph.sh
> > @@ -366,21 +366,26 @@ 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 <position> <data> <string>
> > +# usage: corrupt_graph_and_verify <position> <data> <string> [<zero_pos>]
> >  # 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 <zero_pos>, 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=$(wc -c < $objdir/info/commit-graph) &&
> 
> A minor nit: this test script is unusually prudent about which
> directory/repository each test is executed in, as the first thing each
> test does is to 'cd' into the right directory.  (I think this is a
> Good Thing, and other test scripts should follow suit if they use a
> repo other than $TRASH_DIRECTORY.)  Though it doesn't cause any
> immediate issues (the previous test happens to use the same
> repository), the above line violates this, as it accesses the
> '.git/.../commit-graph' file ...
> 
> > +	zero_pos=${4:-${orig_size}} &&
> >  	cd "$TRASH_DIRECTORY/full" &&
> 
> ... before this line could ensure that it's in the right repository.
Thanks for the catch. Fixed in v5.
Previous: SZEDER GáborNext: Josh Steadmon
Message 29 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.