dir.c: skip .gitignore, etc larger than INT_MAX

We use add_patterns() to read .gitignore, .git/info/exclude, etc, as well as other pattern-like files like sparse-checkout. The parser for these uses an "int" as an index, meaning that files over 2GB will generally cause signed integer overflow and out-of-bounds access. This is unlikely to happen in any real files, but we do read .gitignore files from the tree. A malicious tree could cause an out-of-bounds read and segfault (we also write NULs over newlines, so in theory it could be an out-of-bounds write, too, but as we go char-by-char, the first thing that happens is trying to read a negative 2GB offset). We could fix the most obvious issue by replacing one "int" with a "size_t". But there are tons of "int" sprinkled throughout this code for things like pattern lengths, number of patterns, and so on. Since nobody would actually want a 2GB .gitignore file, an easy defensive measure is to just refuse to parse them. The "int" in question is in add_patterns_from_buffer(), so we could catch it there. But by putting the checks in its two callers, we can produce more useful error messages. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 31, 2024 at 08:00 UTC a2bc523e1ea2ef9b59eb0c26331b6e7d9dc5a812
1 file changed +14
dir.c
+14
@@ -30,6 +30,7 @@
30 #include "symlinks.h"
31 #include "trace2.h"
32 #include "tree.h"
33 +#include "hex.h"
34
35 /*
36 * Tells read_directory_recursive how a file or directory should be treated.
@@ -1136,6 +1137,12 @@ static int add_patterns(const char *fname, const char *base, int baselen,
1137 }
1138 }
1139
1140 + if (size > INT_MAX) {
1141 + warning("ignoring excessively large pattern file: %s", fname);
1142 + free(buf);
1143 + return -1;
1144 + }
1145 +
1146 add_patterns_from_buffer(buf, size, base, baselen, pl);
1147 return 0;
1148 }
@@ -1192,6 +1199,13 @@ int add_patterns_from_blob_to_list(
1199 if (r != 1)
1200 return r;
1201
1202 + if (size > INT_MAX) {
1203 + warning("ignoring excessively large pattern blob: %s",
1204 + oid_to_hex(oid));
1205 + free(buf);
1206 + return -1;
1207 + }
1208 +
1209 add_patterns_from_buffer(buf, size, base, baselen, pl);
1210 return 0;
1211 }