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

[PATCH 2/3] revision: avoid leaking bloom keyvecs with multiple traversals

From
Jeff King <peff@peff.net>
Date
Jul 1, 2026, 06:40 UTC
Message-ID
<20260701064052.GB2580331@coredump.intra.peff.net>
In-Reply-To
<20260701063538.GA2579765@coredump.intra.peff.net>

In prepare_revision_walk(), we convert the pruning pathspecs into bloom-filter "keyvecs" via prepare_to_use_bloom_filter(). This allocates memory which is then freed eventually by release_revisions(), via release_revisions_bloom_keyvecs().

But there's one case where we leak. If a caller uses the same rev_info for multiple walks, calling prepare_revision_walk() multiple times, then subsequent calls will overwrite the earlier keyvecs, leaking them. This can happen with "git show foo bar", which does a separate no-walk traversal for "foo" and "bar". Building with SANITIZE=leak and running the test suite like:

  GIT_TEST_COMMIT_GRAPH=1 \
  GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1 \
  ./t4013-diff-various.sh

will trigger a complaint from LSan. It does not happen without those extra flags because we don't store on-disk bloom filters by default, and thus we optimize out the keyvec computation.

We can fix the leak by discarding the old entries before generating new ones.

There's an alternative fix, which is that prepare_to_use_bloom_filter() could notice that we already have keyvec entries and just reuse them. But this is less safe; the keyvec depends on the pruning pathspec, and we don't know if that has changed.

I think it would _probably_ work in practice, since any caller using a rev_info for multiple traversals is probably doing so with the same pathspec. But it would also create a very subtle bug if that assumption is violated. So we'll do the safer thing here, and generate fresh keyvec entries for each traversal. The efficiency difference is probably not noticeable, and this is what was happening already (we just weren't bothering to free the old ones!).

Signed-off-by: Jeff King <peff@peff.net>
---
 revision.c | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/revision.c b/revision.c
index e91d7e1f11..0ef9d895f0 100644
--- a/revision.c
+++ b/revision.c
@@ -707,6 +707,8 @@ static int convert_pathspec_to_bloom_keyvec(struct bloom_keyvec **out,
 
 static void prepare_to_use_bloom_filter(struct rev_info *revs)
 {
+	release_revisions_bloom_keyvecs(revs);
+
 	if (!revs->commits)
 		return;
 
-- 
2.55.0.394.gcf1c5597d2
Previous: Junio C HamanoNext: Patrick Steinhardt
Message 5 of 11 in “bloom-related leak fixes”
  1. 0/3 bloom-related leak fixesJeff King, Jul 1, 2026
  2. 1/3 bloom: make bloom-filter slab initialization idempotentJeff King, Jul 1, 2026
  3. Derrick StoleeJul 1, 2026
  4. Junio C HamanoJul 1, 2026
  5. 2/3 revision: avoid leaking bloom keyvecs with multiple traversalsJeff King, Jul 1, 2026
  6. Patrick SteinhardtJul 1, 2026
  7. Derrick StoleeJul 1, 2026
  8. Junio C HamanoJul 1, 2026
  9. 3/3 line-log: drop extra copy of range with bloom filtersJeff King, Jul 1, 2026
  10. Derrick StoleeJul 1, 2026
  11. Junio C HamanoJul 1, 2026

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.