From: Duy Nguyen <pclo...@gmail.com>
We have some tricky checks in fsck that rely on a side effect of
require_end_of_header(), and would otherwise easily run outside
non-NUL-terminated buffers. This is a bit brittle, so let's make sure
that only NUL-terminated buffers are passed around to begin with.
Jeff "Peff" King contributed the detailed analysis which call paths are
involved and pointed out that we also have to patch the get_data()
function in unpack-objects.c, which is what Johannes "Dscho" Schindelin
implemented.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
Analyzed-by: Jeff King <p...@peff.net>
Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
On Mon, 8 Dec 2014, Duy Nguyen wrote:
> Subject: [PATCH] index-pack: terminate object buffers with NUL
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
Here is a patch that is updated with Peff's suggested
unpack-object.c:get_data change.
While it is not as good as Peff's analysis, I can provide an
additional data point: the test suite passes cleanly even with
https://github.com/dscho/git/commit/567ad592
applied (and with 567ad592, but without below changes, at least
t1050 does not pass).
builtin/index-pack.c | 4 ++--
builtin/unpack-objects.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a369f55..4632117 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -447,7 +447,7 @@ static void *unpack_entry_data(unsigned long offset,
unsigned long size,
if (type == OBJ_BLOB && size > big_file_threshold)
buf = fixed_buf;
else
- buf = xmalloc(size);
+ buf = xmallocz(size);
memset(&stream, 0, sizeof(stream));
git_inflate_init(&stream);
@@ -552,7 +552,7 @@ static void *unpack_data(struct object_entry *obj,
git_zstream stream;
int status;
- data = xmalloc(consume ? 64*1024 : obj->size);
+ data = xmallocz(consume ? 64*1024 : obj->size);
inbuf = xmalloc((len < 64*1024) ? len : 64*1024);
memset(&stream, 0, sizeof(stream));
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 855d94b..ac66672 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -91,7 +91,7 @@ static void use(int bytes)
static void *get_data(unsigned long size)
{
git_zstream stream;
- void *buf = xmalloc(size);
+ void *buf = xmallocz(size);
memset(&stream, 0, sizeof(stream));
--
1.8.4.msysgit.0.dirty
