From: git@jeffhostetler.com
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, kewill@microsoft.com,
Kevin Willford <kewillf@microsoft.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH] name-hash: fix buffer overrun
Date: Fri, 31 Mar 2017 17:32:14 +0000 [thread overview]
Message-ID: <20170331173214.47514-2-git@jeffhostetler.com> (raw)
In-Reply-To: <20170331173214.47514-1-git@jeffhostetler.com>
From: Kevin Willford <kewillf@microsoft.com>
Add check for the end of the entries for the thread partition.
Add test for lazy init name hash with specific directory structure
The lazy init hash name was causing a buffer overflow when the last
entry in the index was multiple folder deep with parent folders that
did not have any files in them.
This adds a test for the boundary condition of the thread partitions
with the folder structure that was triggering the buffer overflow.
The fix was to check if it is the last entry for the thread partition
in the handle_range_dir and not try to use the next entry in the cache.
Signed-off-by: Kevin Willford <kewillf@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
name-hash.c | 4 +++-
t/t3008-ls-files-lazy-init-name-hash.sh | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 t/t3008-ls-files-lazy-init-name-hash.sh
diff --git a/name-hash.c b/name-hash.c
index cac313c..39309ef 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -342,7 +342,9 @@ static int handle_range_dir(
* Scan forward in the index array for index entries having the same
* path prefix (that are also in this directory).
*/
- if (strncmp(istate->cache[k_start + 1]->name, prefix->buf, prefix->len) > 0)
+ if (k_start + 1 >= k_end)
+ k = k_end;
+ else if (strncmp(istate->cache[k_start + 1]->name, prefix->buf, prefix->len) > 0)
k = k_start + 1;
else if (strncmp(istate->cache[k_end - 1]->name, prefix->buf, prefix->len) == 0)
k = k_end;
diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
new file mode 100644
index 0000000..e46a11b
--- /dev/null
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test_description='Test the lazy init name hash with various folder structures'
+
+. ./test-lib.sh
+
+test_expect_success 'no buffer overflow in lazy_init_name_hash' '
+ (
+ test_seq 2000 | sed "s/^/a_/"
+ echo b/b/b
+ test_seq 2000 | sed "s/^/c_/"
+ test_seq 50 | sed "s/^/d_/" | tr "\n" "/"; echo d
+ ) |
+ sed "s/^/100644 $EMPTY_BLOB\t/" |
+ git update-index --index-info &&
+ test-lazy-init-name-hash -m
+'
+
+test_done
--
2.9.3
next prev parent reply other threads:[~2017-03-31 17:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 17:32 [PATCH] name-hash: fix buffer overrun git
2017-03-31 17:32 ` git [this message]
2017-03-31 19:35 ` Junio C Hamano
2017-03-31 21:18 ` Junio C Hamano
2017-03-31 23:18 ` Junio C Hamano
2017-04-01 4:12 ` Junio C Hamano
2017-04-01 12:12 ` Johannes Schindelin
2017-04-01 18:16 ` Junio C Hamano
2017-04-01 4:14 ` [PATCH] contrib/git-resurrect.sh: do not write \t for HT in sed scripts Junio C Hamano
2017-04-02 9:58 ` Jakub Narębski
2017-04-02 16:46 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170331173214.47514-2-git@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=johannes.schindelin@gmx.de \
--cc=kewill@microsoft.com \
--cc=kewillf@microsoft.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).