Skip to content

Commit 756a042

Browse files
Thomas Rastgitster
authored andcommitted
unpack_entry: avoid freeing objects in base cache
In the !delta_data error path of unpack_entry(), we run free(base). This became a window for use-after-free() in abe601b (sha1_file: remove recursion in unpack_entry, 2013-03-27), as follows: Before abe601b, we got the 'base' from cache_or_unpack_entry(..., 0); keep_cache=0 tells it to also remove that entry. So the 'base' is at this point not cached, and freeing it in the error path is the right thing. After abe601b, the structure changed: we use a three-phase approach where phase 1 finds the innermost base or a base that is already in the cache. In phase 3 we therefore know that all bases we unpack are not part of the delta cache yet. (Observe that we pop from the cache in phase 1, so this is also true for the very first base.) So we make no further attempts to look up the bases in the cache, and just call add_delta_base_cache() on every base object we have assembled. But the !delta_data error path remained unchanged, and now calls free() on a base that has already been entered in the cache. This means that there is a use-after-free if we later use the same base again. So remove that free(); we are still going to use that data. Reported-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Thomas Rast <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent abe601b commit 756a042

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

sha1_file.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2040,7 +2040,6 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
20402040
error("failed to unpack compressed delta "
20412041
"at offset %"PRIuMAX" from %s",
20422042
(uintmax_t)curpos, p->pack_name);
2043-
free(base);
20442043
data = NULL;
20452044
continue;
20462045
}

0 commit comments

Comments
 (0)