@matheusbsbs / matheus-bagliano / commits / 0e8189e270
Fork 0

close another possibility for propagating pack corruption

Abstract -------- With index v2 we have a per object CRC to allow quick and safe reuse of pack data when repacking. This, however, doesn't currently prevent a stealth corruption from being propagated into a new pack when _not_ reusing pack data as demonstrated by the modification to t5302 included here. The Context ----------- The Git database is all checksummed with SHA1 hashes. Any kind of corruption can be confirmed by verifying this per object hash against corresponding data. However this can be costly to perform systematically and therefore this check is often not performed at run time when accessing the object database. First, the loose object format is entirely compressed with zlib which already provide a CRC verification of its own when inflating data. Any disk corruption would be caught already in this case. Then, packed objects are also compressed with zlib but only for their actual payload. The object headers and delta base references are not deflated for obvious performance reasons, however this leave them vulnerable to potentially undetected disk corruptions. Object types are often validated against the expected type when they're requested, and deflated size must always match the size recorded in the object header, so those cases are pretty much covered as well. Where corruptions could go unnoticed is in the delta base reference. Of course, in the OBJ_REF_DELTA case, the odds for a SHA1 reference to get corrupted so it actually matches the SHA1 of another object with the same size (the delta header stores the expected size of the base object to apply against) are virtually zero. In the OBJ_OFS_DELTA case, the reference is a pack offset which would have to match the start boundary of a different base object but still with the same size, and although this is relatively much more "probable" than in the OBJ_REF_DELTA case, the probability is also about zero in absolute terms. Still, the possibility exists as demonstrated in t5302 and is certainly greater than a SHA1 collision, especially in the OBJ_OFS_DELTA case which is now the default when repacking. Again, repacking by reusing existing pack data is OK since the per object CRC provided by index v2 guards against any such corruptions. What t5302 failed to test is a full repack in such case. The Solution ------------ As unlikely as this kind of stealth corruption can be in practice, it certainly isn't acceptable to propagate it into a freshly created pack. But, because this is so unlikely, we don't want to pay the run time cost associated with extra validation checks all the time either. Furthermore, consequences of such corruption in anything but repacking should be rather visible, and even if it could be quite unpleasant, it still has far less severe consequences than actively creating bad packs. So the best compromize is to check packed object CRC when unpacking objects, and only during the compression/writing phase of a repack, and only when not streaming the result. The cost of this is minimal (less than 1% CPU time), and visible only with a full repack. Someone with a stats background could provide an objective evaluation of this, but I suspect that it's bad RAM that has more potential for data corruptions at this point, even in those cases where this extra check is not performed. Still, it is best to prevent a known hole for corruption when recreating object data into a new pack. What about the streamed pack case? Well, any client receiving a pack must always consider that pack as untrusty and perform full validation anyway, hence no such stealth corruption could be propagated to remote repositoryes already. It is therefore worthless doing local validation in that case. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nicolas Pitre committed Oct 31, 2008 at 11:31 UTC 0e8189e2708bc1da08c77c7e1d960f420b6890a5
4 files changed +30 -1
builtin-pack-objects.c
+10
@@ -1698,6 +1698,16 @@ static void prepare_pack(int window, int depth)
1698
1699 get_object_details();
1700
1701 + /*
1702 + * If we're locally repacking then we need to be doubly careful
1703 + * from now on in order to make sure no stealth corruption gets
1704 + * propagated to the new pack. Clients receiving streamed packs
1705 + * should validate everything they get anyway so no need to incur
1706 + * the additional cost here in that case.
1707 + */
1708 + if (!pack_to_stdout)
1709 + do_check_packed_object_crc = 1;
1710 +
1711 if (!nr_objects || !window || !depth)
1712 return;
1713
cache.h
+3
@@ -565,6 +565,9 @@ extern int force_object_loose(const unsigned char *sha1, time_t mtime);
565 /* just like read_sha1_file(), but non fatal in presence of bad objects */
566 extern void *read_object(const unsigned char *sha1, enum object_type *type, unsigned long *size);
567
568 +/* global flag to enable extra checks when accessing packed objects */
569 +extern int do_check_packed_object_crc;
570 +
571 extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
572
573 extern int move_temp_to_file(const char *tmpfile, const char *filename);
sha1_file.c
+15
@@ -1694,6 +1694,8 @@ static void *unpack_delta_entry(struct packed_git *p,
1694 return result;
1695 }
1696
1697 +int do_check_packed_object_crc;
1698 +
1699 void *unpack_entry(struct packed_git *p, off_t obj_offset,
1700 enum object_type *type, unsigned long *sizep)
1701 {
@@ -1701,6 +1703,19 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
1703 off_t curpos = obj_offset;
1704 void *data;
1705
1706 + if (do_check_packed_object_crc && p->index_version > 1) {
1707 + struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
1708 + unsigned long len = revidx[1].offset - obj_offset;
1709 + if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
1710 + const unsigned char *sha1 =
1711 + nth_packed_object_sha1(p, revidx->nr);
1712 + error("bad packed object CRC for %s",
1713 + sha1_to_hex(sha1));
1714 + mark_bad_packed_object(p, sha1);
1715 + return NULL;
1716 + }
1717 + }
1718 +
1719 *type = unpack_object_header(p, &w_curs, &curpos, sizep);
1720 switch (*type) {
1721 case OBJ_OFS_DELTA:
t/t5302-pack-index.sh
+2 -1
@@ -160,7 +160,8 @@ test_expect_success \
160
161 test_expect_success \
162 '[index v2] 5) pack-objects refuses to reuse corrupted data' \
163 - 'test_must_fail git pack-objects test-5 <obj-list'
163 + 'test_must_fail git pack-objects test-5 <obj-list &&
164 + test_must_fail git pack-objects --no-reuse-object test-6 <obj-list'
165
166 test_expect_success \
167 '[index v2] 6) verify-pack detects CRC mismatch' \