From: Jeff King <peff@peff.net>
To: Jann Horn <jannh@google.com>
Cc: git@vger.kernel.org, gitster@pobox.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Nicolas Pitre" <nico@fluxnic.net>
Subject: [PATCH 1/5] test-delta: read input into a heap buffer
Date: Thu, 30 Aug 2018 03:07:52 -0400 [thread overview]
Message-ID: <20180830070751.GA15420@sigill.intra.peff.net> (raw)
In-Reply-To: <20180830070548.GA15081@sigill.intra.peff.net>
We currently read the input to test-delta by mmap()-ing it.
However, memory-checking tools like valgrind and ASan are
less able to detect reads/writes past the end of an mmap'd
buffer, because the OS is likely to give us extra bytes to
pad out the final page size. So instead, let's read into a
heap buffer.
As a bonus, this also makes it possible to write tests with
empty bases, as mmap() will complain about a zero-length
map.
This is based on a patch by Jann Horn <jannh@google.com>
which actually aligned the data at the end of a page, and
followed it with another page marked with mprotect(). That
would detect problems even without a tool like ASan, but it
was significantly more complex and may have introduced
portability problems. By comparison, this approach pushes
the complexity onto existing memory-checking tools.
Note that this could be done even more simply by using
strbuf_read_file(), but that would defeat the purpose:
strbufs generally overallocate (and at the very least
include a trailing NUL which we do not care about), which
would defeat most memory checkers.
Signed-off-by: Jeff King <peff@peff.net>
---
t/helper/test-delta.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/helper/test-delta.c b/t/helper/test-delta.c
index 34c7259248..e749a49c88 100644
--- a/t/helper/test-delta.c
+++ b/t/helper/test-delta.c
@@ -34,8 +34,8 @@ int cmd__delta(int argc, const char **argv)
return 1;
}
from_size = st.st_size;
- from_buf = mmap(NULL, from_size, PROT_READ, MAP_PRIVATE, fd, 0);
- if (from_buf == MAP_FAILED) {
+ from_buf = xmalloc(from_size);
+ if (read_in_full(fd, from_buf, from_size) < 0) {
perror(argv[2]);
close(fd);
return 1;
@@ -48,8 +48,8 @@ int cmd__delta(int argc, const char **argv)
return 1;
}
data_size = st.st_size;
- data_buf = mmap(NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0);
- if (data_buf == MAP_FAILED) {
+ data_buf = xmalloc(data_size);
+ if (read_in_full(fd, data_buf, data_size) < 0) {
perror(argv[3]);
close(fd);
return 1;
--
2.19.0.rc1.539.g3876d0831e
next prev parent reply other threads:[~2018-08-30 7:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-29 20:58 [PATCH 1/3] patch-delta: fix oob read Jann Horn
2018-08-29 20:58 ` [PATCH 2/3] t/helper/test-delta: segfault on OOB access Jann Horn
2018-08-29 21:34 ` Jeff King
2018-08-29 21:40 ` Jann Horn
2018-08-29 21:46 ` Jeff King
2018-08-29 21:48 ` Jeff King
2018-08-29 20:58 ` [PATCH 3/3] t5303: add tests for corrupted deltas Jann Horn
2018-08-29 22:03 ` Jeff King
2018-08-29 22:30 ` Jeff King
2018-08-29 21:20 ` [PATCH 1/3] patch-delta: fix oob read Jeff King
2018-08-29 22:18 ` Jeff King
2018-08-30 7:05 ` [PATCH 0/5] handle corruption in patch-delta Jeff King
2018-08-30 7:07 ` Jeff King [this message]
2018-08-30 7:09 ` [PATCH 2/5] t5303: test some corrupt deltas Jeff King
2018-08-30 17:38 ` Junio C Hamano
2018-08-30 18:42 ` Jeff King
2018-08-30 18:44 ` Jeff King
2018-08-30 18:50 ` Junio C Hamano
2018-08-30 19:13 ` Jeff King
2018-08-31 9:58 ` Johannes Schindelin
2018-08-31 15:33 ` Junio C Hamano
2018-08-31 19:47 ` Jeff King
2018-08-31 21:39 ` Junio C Hamano
2018-08-31 21:14 ` Johannes Schindelin
2018-08-31 21:41 ` Jeff King
2018-08-31 21:55 ` Junio C Hamano
2018-08-30 7:09 ` [PATCH 3/5] patch-delta: fix oob read Jeff King
2018-08-30 7:10 ` [PATCH 4/5] patch-delta: consistently report corruption Jeff King
2018-08-30 7:12 ` [PATCH 5/5] patch-delta: handle truncated copy parameters Jeff King
2018-08-30 13:25 ` [PATCH 0/5] handle corruption in patch-delta Jann Horn
2018-08-30 15:23 ` Nicolas Pitre
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=20180830070751.GA15420@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jannh@google.com \
--cc=johannes.schindelin@gmx.de \
--cc=nico@fluxnic.net \
--cc=pclouds@gmail.com \
/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).