[PATCH] quickfetch(): Prevent overflow of the rev-list command line
From: Johan Herland <hidden>
Date: 2016-06-15 22:47:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] quickfetch(): Prevent overflow of the rev-list command line · Johan Herland <hidden>
- 2016-06-15 · Re: [PATCH] quickfetch(): Prevent overflow of the rev-list command line · Johannes Sixt <hidden>
- 2016-06-15 · Re: [PATCH] quickfetch(): Prevent overflow of the rev-list command line · Johan Herland <hidden>
- 2016-06-15 · Re: [PATCH] quickfetch(): Prevent overflow of the rev-list command line · Alex Riesen <hidden>
- 2016-06-15 · Re: [PATCH] quickfetch(): Prevent overflow of the rev-list command line · Johan Herland <hidden>
quickfetch() calls rev-list to check whether the objects we are about to fetch are already present in the repo (if so, we can skip the object fetch). However, when there are many (~1000) refs to be fetched, the rev-list command line grows larger than the maximum command line size on some systems (32K in Windows). This causes rev-list to fail, making quickfetch() return non-zero, which unnecessarily triggers the transport machinery. This somehow causes fetch to fail with an exit code. By using the --stdin option to rev-list (and feeding the object list to its standard input), we prevent the overflow of the rev-list command line, which causes quickfetch(), and subsequently the overall fetch, to succeed. However, using rev-list --stdin is not entirely straightforward: rev-list terminates immediately when encountering an unknown object, which can trigger SIGPIPE if we are still writing object's to its standard input. We therefore ignore SIGPIPE so that the fetch process is not terminated. Signed-off-by: Johan Herland <redacted> Improved-by: Johannes Sixt [off-list ref] Improved-by: Alex Riesen [off-list ref] Tested-by: Peter Krefting <redacted> --- builtin-fetch.c | 62 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/builtin-fetch.c b/builtin-fetch.c
index cd5eb9a..20bcbdd 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c@@ -400,14 +400,14 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, /* * We would want to bypass the object transfer altogether if - * everything we are going to fetch already exists and connected + * everything we are going to fetch already exists and is connected * locally. * - * The refs we are going to fetch are in to_fetch (nr_heads in - * total). If running + * The refs we are going to fetch are in ref_map. If running * - * $ git rev-list --objects to_fetch[0] to_fetch[1] ... --not --all + * $ git rev-list --objects --stdin --not --all * + * (feeding all the refs in ref_map on its standard input) * does not error out, that means everything reachable from the * refs we are going to fetch exists and is connected to some of * our existing refs.
@@ -416,8 +416,9 @@ static int quickfetch(struct ref *ref_map) { struct child_process revlist; struct ref *ref; - char **argv; - int i, err; + int err; + const char *argv[] = {"rev-list", + "--quiet", "--objects", "--stdin", "--not", "--all", NULL}; /* * If we are deepening a shallow clone we already have these
@@ -429,34 +430,41 @@ static int quickfetch(struct ref *ref_map) if (depth) return -1; - for (i = 0, ref = ref_map; ref; ref = ref->next) - i++; - if (!i) + if (!ref_map) return 0; - argv = xmalloc(sizeof(*argv) * (i + 6)); - i = 0; - argv[i++] = xstrdup("rev-list"); - argv[i++] = xstrdup("--quiet"); - argv[i++] = xstrdup("--objects"); - for (ref = ref_map; ref; ref = ref->next) - argv[i++] = xstrdup(sha1_to_hex(ref->old_sha1)); - argv[i++] = xstrdup("--not"); - argv[i++] = xstrdup("--all"); - argv[i++] = NULL; - memset(&revlist, 0, sizeof(revlist)); - revlist.argv = (const char**)argv; + revlist.argv = argv; revlist.git_cmd = 1; - revlist.no_stdin = 1; revlist.no_stdout = 1; revlist.no_stderr = 1; - err = run_command(&revlist); + revlist.in = -1; + + /* If rev-list --stdin encounters an unknown commit, it terminates, + * which will cause SIGPIPE in the write loop below. */ + signal(SIGPIPE, SIG_IGN); + + err = start_command(&revlist); + if (err) { + error("could not run rev-list"); + return err; + } - for (i = 0; argv[i]; i++) - free(argv[i]); - free(argv); - return err; + for (ref = ref_map; ref; ref = ref->next) { + if (write_in_full(revlist.in, sha1_to_hex(ref->old_sha1), 40) < 0 || + write_in_full(revlist.in, "\n", 1) < 0) { + err = errno; + if (err != EPIPE && err != EINVAL) + error("failed write to rev-list"); + break; + } + } + + if (close(revlist.in)) { + err = errno; + error("failed to close rev-list's stdin"); + } + return finish_command(&revlist) || err; } static int fetch_refs(struct transport *transport, struct ref *ref_map)
--
1.6.3.rc0.1.gf800