commit-graph: check bounds when accessing BDAT chunk

When loading Bloom filters from a commit-graph file, we use the offset values in the BIDX chunk to index into the memory mapped for the BDAT chunk. But since we don't record how big the BDAT chunk is, we just trust that the BIDX offsets won't cause us to read outside of the chunk memory. A corrupted or malicious commit-graph file will cause us to segfault (in practice this isn't a very interesting attack, since commit-graph files are local-only, and the worst case is an out-of-bounds read). We can't fix this by checking the chunk size during parsing, since the data in the BDAT chunk doesn't have a fixed size (that's why we need the BIDX in the first place). So we'll fix it in two parts: 1. Record the BDAT chunk size during parsing, and then later check that the BIDX offsets we look up are within bounds. 2. Because the offsets are relative to the end of the BDAT header, we must also make sure that the BDAT chunk is at least as large as the expected header size. Otherwise, we overflow when trying to move past the header, even for an offset of "0". We can check this early, during the parsing stage. The error messages are rather verbose, but since this is not something you'd expect to see outside of severe bugs or corruption, it makes sense to err on the side of too many details. Sadly we can't mention the filename during the chunk-parsing stage, as we haven't set g->filename at this point, nor passed it down through the stack. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 9, 2023 at 17:05 UTC 920f400e919c7c51f81adc6989cdd52630220783
4 files changed +63
bloom.c
+24
@@ -29,6 +29,26 @@ static inline unsigned char get_bitmask(uint32_t pos)
29 return ((unsigned char)1) << (pos & (BITS_PER_WORD - 1));
30 }
31
32 +static int check_bloom_offset(struct commit_graph *g, uint32_t pos,
33 + uint32_t offset)
34 +{
35 + /*
36 + * Note that we allow offsets equal to the data size, which would set
37 + * our pointers at one past the end of the chunk memory. This is
38 + * necessary because the on-disk index points to the end of the
39 + * entries (so we can compute size by comparing adjacent ones). And
40 + * naturally the final entry's end is one-past-the-end of the chunk.
41 + */
42 + if (offset <= g->chunk_bloom_data_size - BLOOMDATA_CHUNK_HEADER_SIZE)
43 + return 0;
44 +
45 + warning("ignoring out-of-range offset (%"PRIuMAX") for changed-path"
46 + " filter at pos %"PRIuMAX" of %s (chunk size: %"PRIuMAX")",
47 + (uintmax_t)offset, (uintmax_t)pos,
48 + g->filename, (uintmax_t)g->chunk_bloom_data_size);
49 + return -1;
50 +}
51 +
52 static int load_bloom_filter_from_graph(struct commit_graph *g,
53 struct bloom_filter *filter,
54 uint32_t graph_pos)
@@ -51,6 +71,10 @@ static int load_bloom_filter_from_graph(struct commit_graph *g,
71 else
72 start_index = 0;
73
74 + if (check_bloom_offset(g, lex_pos, end_index) < 0 ||
75 + check_bloom_offset(g, lex_pos - 1, start_index) < 0)
76 + return 0;
77 +
78 filter->len = end_index - start_index;
79 filter->data = (unsigned char *)(g->chunk_bloom_data +
80 sizeof(unsigned char) * start_index +
commit-graph.c
+10
@@ -365,7 +365,17 @@ static int graph_read_bloom_data(const unsigned char *chunk_start,
365 {
366 struct commit_graph *g = data;
367 uint32_t hash_version;
368 +
369 + if (chunk_size < BLOOMDATA_CHUNK_HEADER_SIZE) {
370 + warning("ignoring too-small changed-path chunk"
371 + " (%"PRIuMAX" < %"PRIuMAX") in commit-graph file",
372 + (uintmax_t)chunk_size,
373 + (uintmax_t)BLOOMDATA_CHUNK_HEADER_SIZE);
374 + return -1;
375 + }
376 +
377 g->chunk_bloom_data = chunk_start;
378 + g->chunk_bloom_data_size = chunk_size;
379 hash_version = get_be32(chunk_start);
380
381 if (hash_version != 1)
commit-graph.h
+1
@@ -101,6 +101,7 @@ struct commit_graph {
101 size_t chunk_base_graphs_size;
102 const unsigned char *chunk_bloom_indexes;
103 const unsigned char *chunk_bloom_data;
104 + size_t chunk_bloom_data_size;
105
106 struct topo_level_slab *topo_levels;
107 struct bloom_filter_settings *bloom_filter_settings;
t/t4216-log-bloom.sh
+28
@@ -5,6 +5,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7 . ./test-lib.sh
8 +. "$TEST_DIRECTORY"/lib-chunk.sh
9
10 GIT_TEST_COMMIT_GRAPH=0
11 GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
@@ -404,4 +405,31 @@ test_expect_success 'Bloom generation backfills empty commits' '
405 )
406 '
407
408 +corrupt_graph () {
409 + graph=.git/objects/info/commit-graph &&
410 + test_when_finished "rm -rf $graph" &&
411 + git commit-graph write --reachable --changed-paths &&
412 + corrupt_chunk_file $graph "$@"
413 +}
414 +
415 +check_corrupt_graph () {
416 + corrupt_graph "$@" &&
417 + git -c core.commitGraph=false log -- A/B/file2 >expect.out &&
418 + git -c core.commitGraph=true log -- A/B/file2 >out 2>err &&
419 + test_cmp expect.out out
420 +}
421 +
422 +test_expect_success 'Bloom reader notices too-small data chunk' '
423 + check_corrupt_graph BDAT clear 00000000 &&
424 + echo "warning: ignoring too-small changed-path chunk" \
425 + "(4 < 12) in commit-graph file" >expect.err &&
426 + test_cmp expect.err err
427 +'
428 +
429 +test_expect_success 'Bloom reader notices out-of-bounds filter offsets' '
430 + check_corrupt_graph BIDX 12 FFFFFFFF &&
431 + # use grep to avoid depending on exact chunk size
432 + grep "warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph" err
433 +'
434 +
435 test_done