Skip to content

Commit 0cf15e3

Browse files
committed
pack: fix race in pack_entry_find_offset
In `pack_entry_find_offset`, we try to find the offset of a certain object in the pack file. To do so, we first assert if the packfile has already been opened and open it if not. Opening the packfile is guarded with a mutex, so concurrent access to this is in fact safe. What is not thread-safe though is our calculation of offsets inside the packfile. Assume two threads calling `pack_entry_find_offset` at the same time. We first calculate the offset and index location and only then determine if the pack has already been opened. If so, we re-calculate the offset and index address. Now the case for two threads: thread 1 first calculates the addresses and is subsequently suspended. The second thread will now call `pack_index_open` and initialize the pack file, calculating its addresses correctly. When the first thread is resumed now, he'll see that the pack file has already been initialized and will happily proceed with the addresses it has already calculated before the check. As the pack file was not initialized before, these addresses are bogus. Fix the issue by only calculating the addresses after having checked if the pack file is open.
1 parent 19001ca commit 0cf15e3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/pack.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,8 +1268,8 @@ static int pack_entry_find_offset(
12681268
const git_oid *short_oid,
12691269
size_t len)
12701270
{
1271-
const uint32_t *level1_ofs = p->index_map.data;
1272-
const unsigned char *index = p->index_map.data;
1271+
const uint32_t *level1_ofs;
1272+
const unsigned char *index;
12731273
unsigned hi, lo, stride;
12741274
int pos, found = 0;
12751275
git_off_t offset;
@@ -1283,11 +1283,11 @@ static int pack_entry_find_offset(
12831283
if ((error = pack_index_open(p)) < 0)
12841284
return error;
12851285
assert(p->index_map.data);
1286-
1287-
index = p->index_map.data;
1288-
level1_ofs = p->index_map.data;
12891286
}
12901287

1288+
index = p->index_map.data;
1289+
level1_ofs = p->index_map.data;
1290+
12911291
if (p->index_version > 1) {
12921292
level1_ofs += 2;
12931293
index += 8;

0 commit comments

Comments
 (0)