midx: check consistency of fanout table

The commit-graph, midx, and pack idx on-disk formats all have oid fanout
tables which are fed to bsearch_hash(). If these tables do not increase
monotonically, then the binary search may not only produce bogus values,
it may cause out of bounds reads.

We fixed this for commit graphs in 4169d89645 (commit-graph: check
consistency of fanout table, 2023-10-09). That commit argued that we did
not need to do the same for midx and pack idx files, because they
already did this check. However, that is wrong. We _do_ check the fanout
table for pack idx files when we load them, but we only do so for midx
files when running "git multi-pack-index verify". So it is possible to
get an out-of-bounds read by running a normal command with a specially
crafted midx file.

Let's fix this using the same solution (and roughly the same test) we
did for the commit-graph in 4169d89645. This replaces the same check
from "multi-pack-index verify", because verify uses the same read
routines, we'd bail on reading the midx much sooner now. So let's make
sure to copy its verbose error message.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/midx.c b/midx.c
index 2f3863c936a4c1c9035f90ae28b73887cf8f24b2..1d14661dade4a686b1b18c351c55275b2a388ee3 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -64,6 +64,7 @@ void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m)
 static int midx_read_oid_fanout(const unsigned char *chunk_start,
                                size_t chunk_size, void *data)
 {
+       int i;
        struct multi_pack_index *m = data;
        m->chunk_oid_fanout = (uint32_t *)chunk_start;
 
@@ -71,6 +72,16 @@ static int midx_read_oid_fanout(const unsigned char *chunk_start,
                error(_("multi-pack-index OID fanout is of the wrong size"));
                return 1;
        }
+       for (i = 0; i < 255; i++) {
+               uint32_t oid_fanout1 = ntohl(m->chunk_oid_fanout[i]);
+               uint32_t oid_fanout2 = ntohl(m->chunk_oid_fanout[i+1]);
+
+               if (oid_fanout1 > oid_fanout2) {
+                       error(_("oid fanout out of order: fanout[%d] = %"PRIx32" > %"PRIx32" = fanout[%d]"),
+                             i, oid_fanout1, oid_fanout2, i + 1);
+                       return 1;
+               }
+       }
        m->num_objects = ntohl(m->chunk_oid_fanout[255]);
        return 0;
 }
@@ -1782,15 +1793,6 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
        }
        stop_progress(&progress);
 
-       for (i = 0; i < 255; i++) {
-               uint32_t oid_fanout1 = ntohl(m->chunk_oid_fanout[i]);
-               uint32_t oid_fanout2 = ntohl(m->chunk_oid_fanout[i + 1]);
-
-               if (oid_fanout1 > oid_fanout2)
-                       midx_report(_("oid fanout out of order: fanout[%d] = %"PRIx32" > %"PRIx32" = fanout[%d]"),
-                                   i, oid_fanout1, oid_fanout2, i + 1);
-       }
-
        if (m->num_objects == 0) {
                midx_report(_("the midx contains no oid"));
                /*

diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index d3c9e97feb12b7d80a1c74189a0da04c438152c5..313496c0cf5603542688164f8e79aff7b32fd6f7 100755 (executable)
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -1157,4 +1157,18 @@ test_expect_success 'reader notices too-small revindex chunk' '
        test_cmp expect.err err
 '
 
+test_expect_success 'reader notices out-of-bounds fanout' '
+       # This is similar to the out-of-bounds fanout test in t5318. The values
+       # in adjacent entries should be large but not identical (they
+       # are used as hi/lo starts for a binary search, which would then abort
+       # immediately).
+       corrupt_chunk OIDF 0 $(printf "%02x000000" $(test_seq 0 254)) &&
+       test_must_fail git log 2>err &&
+       cat >expect <<-\EOF &&
+       error: oid fanout out of order: fanout[254] = fe000000 > 5c = fanout[255]
+       fatal: multi-pack-index required OID fanout chunk missing or corrupted
+       EOF
+       test_cmp expect err
+'
+
 test_done