threads / patch / 66654

patchoss-fuzz: set a gitdir in the commit-graph fuzzer

Subject: [PATCH] oss-fuzz: set a gitdir in the commit-graph fuzzer

## tl;dr

Sami Jawhar's patch gives the oss-fuzz target a placeholder gitdir so it can reach the optional-chunk parsing it was meant to exercise. Read the story.

replies: 1people: 2as markdown or json

Sami Jawhar· Oct 24, 2026, 18:50 UTC · lore

Since f1141b4391 (commit-graph: refactor `parse_commit_graph()` to take a repository, 2025-08-15), parse_commit_graph() calls prepare_repo_settings().

The fuzzer sets settings.initialized, so that git reads no configuration. But prepare_repo_settings() checks for a gitdir before it reads that flag, and the repository of the fuzzer has no gitdir. Thus each input that passes the header and the three required chunks stops at

    BUG: repo-settings.c:40: Cannot add settings for uninitialized repository

The fuzzer never reaches the code that reads the optional chunks: generation data and changed-path Bloom filters.

Set a placeholder gitdir, as test-path-utils does. prepare_repo_settings() checks only that the gitdir is not NULL. It then returns, because the fuzzer marks the settings as initialized. repo_clear() frees the gitdir, and no code opens a file under it.

Signed-off-by: Sami Jawhar <sami@theorem.dev>
---
 oss-fuzz/fuzz-commit-graph.c | 1 +
 1 file changed, 1 insertion(+)
Show changes to oss-fuzz/fuzz-commit-graph.c +1 −0
diff --git a/oss-fuzz/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c
index 59bbb84..9a226eb 100644
--- a/oss-fuzz/fuzz-commit-graph.c
+++ b/oss-fuzz/fuzz-commit-graph.c
@@ -20,6 +20,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 	 * possible.
 	 */
 	repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
+	the_repository->gitdir = xstrdup(".git");
 	the_repository->settings.initialized = 1;
 	the_repository->settings.commit_graph_generation_version = 2;
 	the_repository->settings.commit_graph_changed_paths_version = 1;
Patrick Steinhardt· Oct 29, 2026, 12:23 UTC · re: Sami Jawhar · lore

Re: [PATCH] oss-fuzz: set a gitdir in the commit-graph fuzzer

On Sat, Oct 24, 2026 at 11:50:42AM -0700, Sami Jawhar wrote:
Show 14 quoted lines
> Since f1141b4391 (commit-graph: refactor `parse_commit_graph()` to take
> a repository, 2025-08-15), parse_commit_graph() calls
> prepare_repo_settings().
> 
> The fuzzer sets settings.initialized, so that git reads no
> configuration. But prepare_repo_settings() checks for a gitdir before
> it reads that flag, and the repository of the fuzzer has no gitdir.
> Thus each input that passes the header and the three required chunks
> stops at
> 
>     BUG: repo-settings.c:40: Cannot add settings for uninitialized repository
> 
> The fuzzer never reaches the code that reads the optional chunks:
> generation data and changed-path Bloom filters.

Oh, indeed. I thought that at one point in time we did a smoke test of our fuzzers that would have detected issues like this. But seemingly we don't, or otherwise our CI would have failed.

It would be great to restore that so that fuzzers don't silently break anymore, but that's certainly outside the scope of this patch series.

Show 12 quoted lines
> diff --git a/oss-fuzz/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c
> index 59bbb84..9a226eb 100644
> --- a/oss-fuzz/fuzz-commit-graph.c
> +++ b/oss-fuzz/fuzz-commit-graph.c
> @@ -20,6 +20,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
>  	 * possible.
>  	 */
>  	repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
> +	the_repository->gitdir = xstrdup(".git");
>  	the_repository->settings.initialized = 1;
>  	the_repository->settings.commit_graph_generation_version = 2;
>  	the_repository->settings.commit_graph_changed_paths_version = 1;

We already call `repo_clear()`, so we don't have to manually free this, either.

So this looks good to me, thanks for the fix!
Patrick

← back to recent threads