Skip to content

Commit 921bdd9

Browse files
elfstromgitster
authored andcommitted
setup: sanity check file size in read_gitfile_gently
read_gitfile_gently will allocate a buffer to fit the entire file that should be read. Add a sanity check of the file size before opening to avoid allocating a potentially huge amount of memory if we come across a large file that someone happened to name ".git". The limit is set to a sufficiently unreasonable size that should never be exceeded by a genuine .git file. Signed-off-by: Erik Elfström <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a93beda commit 921bdd9

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

cache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ extern const char *get_git_work_tree(void);
454454
#define READ_GITFILE_ERR_INVALID_FORMAT 5
455455
#define READ_GITFILE_ERR_NO_PATH 6
456456
#define READ_GITFILE_ERR_NOT_A_REPO 7
457+
#define READ_GITFILE_ERR_TOO_LARGE 8
457458
extern const char *read_gitfile_gently(const char *path, int *return_error_code);
458459
#define read_gitfile(path) read_gitfile_gently((path), NULL)
459460
extern const char *resolve_gitdir(const char *suspect);

setup.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ static void update_linked_gitdir(const char *gitfile, const char *gitdir)
414414
*/
415415
const char *read_gitfile_gently(const char *path, int *return_error_code)
416416
{
417+
const int max_file_size = 1 << 20; /* 1MB */
417418
int error_code = 0;
418419
char *buf = NULL;
419420
char *dir = NULL;
@@ -430,6 +431,10 @@ const char *read_gitfile_gently(const char *path, int *return_error_code)
430431
error_code = READ_GITFILE_ERR_NOT_A_FILE;
431432
goto cleanup_return;
432433
}
434+
if (st.st_size > max_file_size) {
435+
error_code = READ_GITFILE_ERR_TOO_LARGE;
436+
goto cleanup_return;
437+
}
433438
fd = open(path, O_RDONLY);
434439
if (fd < 0) {
435440
error_code = READ_GITFILE_ERR_OPEN_FAILED;
@@ -489,6 +494,8 @@ const char *read_gitfile_gently(const char *path, int *return_error_code)
489494
return NULL;
490495
case READ_GITFILE_ERR_OPEN_FAILED:
491496
die_errno("Error opening '%s'", path);
497+
case READ_GITFILE_ERR_TOO_LARGE:
498+
die("Too large to be a .git file: '%s'", path);
492499
case READ_GITFILE_ERR_READ_FAILED:
493500
die("Error reading %s", path);
494501
case READ_GITFILE_ERR_INVALID_FORMAT:

0 commit comments

Comments
 (0)