git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] sparse-index: copy dir_hash in ensure_full_index()

From
Derrick Stolee <stolee@gmail.com>
Date
Aug 23, 2021, 13:13 UTC
Message-ID
<5c0f41fb-e8d2-0aa5-66a3-6a61a98e8381@gmail.com>
In-Reply-To
<pull.1017.git.1629136135286.gitgitgadget@gmail.com>
On 8/16/2021 1:48 PM, Derrick Stolee via GitGitGadget wrote:
Show 35 quoted lines
> From: Jeff Hostetler <jeffhost@microsoft.com>
> 
> Copy the 'index_state->dir_hash' back to the real istate after expanding
> a sparse index.
> 
> A crash was observed in 'git status' during some hashmap lookups with
> corrupted hashmap entries.  During an index expansion, new cache-entries
> are added to the 'index_state->name_hash' and the 'dir_hash' in a
> temporary 'index_state' variable 'full'.  However, only the 'name_hash'
> hashmap from this temp variable was copied back into the real 'istate'
> variable.  The original copy of the 'dir_hash' was incorrectly
> preserved.  If the table in the 'full->dir_hash' hashmap were realloced,
> the stale version (in 'istate') would be corrupted.
> 
> The test suite does not operate on index sizes sufficiently large to
> trigger this reallocation, so they do not cover this behavior.
> Increasing the test suite to cover such scale is fragile and likely
> wasteful.
> 
> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
> ---
>     sparse-index: copy dir_hash in ensure_full_index()
>     
>     This fix is an issue we discovered in our first experimental release of
>     the sparse index in the microsoft/git fork. We fixed it in the latest
>     experimental release [1] and then I almost forgot about it until we
>     started rebasing sparse-index work on top of the 2.33.0 release
>     candidates.
>     
>     [1] https://github.com/microsoft/git/releases/tag/v2.32.0.vfs.0.102.exp
>     
>     This is a change that can be taken anywhere since 4300f8 (sparse-index:
>     implement ensure_full_index(), 2021-03-30), but this version is based on
>     v2.33.0-rc2.

I sent this patch on the day of v2.33.0, so I'm not surprised that it got lost in the shuffle. Could someone please take a look?

It also has not been picked up for the What's Cooking email.

Thanks, -Stolee

Previous: Derrick Stolee via GitGitGadgetNext: Elijah Newren
Message 2 of 7 in “sparse-index: copy dir_hash in ensure_full_index()”
  1. sparse-index: copy dir_hash in ensure_full_index()Derrick Stolee via GitGitGadget, Aug 16, 2021
  2. Derrick StoleeAug 23, 2021
  3. Elijah NewrenAug 23, 2021
  4. Johannes SchindelinAug 23, 2021
  5. Ævar Arnfjörð BjarmasonAug 23, 2021
  6. Jeff HostetlerAug 23, 2021
  7. Derrick StoleeAug 23, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.