@matheusbsbs / matheus-bagliano / commits / 6c307626f1
Fork 0

grep: protect packed_git [re-]initialization

Some fields in struct raw_object_store are lazy initialized by the thread-unsafe packfile.c:prepare_packed_git(). Although this function is present in the call stack of git-grep threads, all paths to it are currently protected by obj_read_lock() (and the main thread usually indirectly calls it before firing the worker threads, anyway). However, it's possible that future modifications add new unprotected paths to it, introducing a race condition. Because errors derived from it wouldn't happen often, it could be hard to detect. So to prevent future headaches, let's force eager initialization of packed_git when setting git-grep up. There'll be a small overhead in the cases where we didn't really need to prepare packed_git during execution but this shouldn't be very noticeable. Also, packed_git may be re-initialized by packfile.c:reprepare_packed_git(). Again, all paths to it in git-grep are already protected by obj_read_lock() but it may suffer from the same problem in the future. So let's also internally protect it with obj_read_lock() (which is a recursive mutex). Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Matheus Tavares committed Jan 15, 2020 at 23:39 UTC 6c307626f1e84fefe7da72296ce8f91b0cdd182c
2 files changed +8 -2
builtin/grep.c
+6 -2
@@ -24,6 +24,7 @@
24 #include "submodule.h"
25 #include "submodule-config.h"
26 #include "object-store.h"
27 +#include "packfile.h"
28
29 static char const * const grep_usage[] = {
30 N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"),
@@ -1074,11 +1075,14 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
1075 skip_first_line = 1;
1076
1077 /*
1077 - * Pre-read gitmodules (if not read already) to prevent racy
1078 - * lazy reading in worker threads.
1078 + * Pre-read gitmodules (if not read already) and force eager
1079 + * initialization of packed_git to prevent racy lazy
1080 + * reading/initialization once worker threads are started.
1081 */
1082 if (recurse_submodules)
1083 repo_read_gitmodules(the_repository, 1);
1084 + if (startup_info->have_repository)
1085 + (void)get_packed_git(the_repository);
1086
1087 start_threads(&opt);
1088 } else {
packfile.c
+2
@@ -1004,12 +1004,14 @@ void reprepare_packed_git(struct repository *r)
1004 {
1005 struct object_directory *odb;
1006
1007 + obj_read_lock();
1008 for (odb = r->objects->odb; odb; odb = odb->next)
1009 odb_clear_loose_cache(odb);
1010
1011 r->objects->approximate_object_count_valid = 0;
1012 r->objects->packed_git_initialized = 0;
1013 prepare_packed_git(r);
1014 + obj_read_unlock();
1015 }
1016
1017 struct packed_git *get_packed_git(struct repository *r)