From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: rv@rasmusvillemoes.dk, "Jeff King" <peff@peff.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 3/6] shallow.c: make paint_alloc slightly more robust
Date: Tue, 6 Dec 2016 19:53:36 +0700 [thread overview]
Message-ID: <20161206125339.16803-4-pclouds@gmail.com> (raw)
In-Reply-To: <20161206125339.16803-1-pclouds@gmail.com>
paint_alloc() allocates a big block of memory and splits it into
smaller, fixed size, chunks of memory whenever it's called. Each chunk
contains enough bits to present all "new refs" [1] in a fetch from a
shallow repository.
We do not check if the new "big block" is smaller than the requested
memory chunk though. If it happens, we'll happily pass back a memory
region smaller than expected. Which will lead to problems eventually.
A normal fetch may add/update a dozen new refs. Let's stay on the
"reasonably extreme" side and say we need 16k refs (or bits from
paint_alloc's perspective). Each chunk of memory would be 2k, much
smaller than the memory pool (512k).
So, normally, the under-allocation situation should never happen. A bad
guy, however, could make a fetch that adds more than 4m new/updated refs
to this code which results in a memory chunk larger than pool size.
Check this case and abort.
Noticed-by: Rasmus Villemoes <rv@rasmusvillemoes.dk>
[1] Details are in commit message of 58babff (shallow.c: the 8 steps to
select new commits for .git/shallow - 2013-12-05), step 6.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
shallow.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/shallow.c b/shallow.c
index 2512ed3..75e1702 100644
--- a/shallow.c
+++ b/shallow.c
@@ -447,6 +447,9 @@ static uint32_t *paint_alloc(struct paint_info *info)
unsigned size = nr * sizeof(uint32_t);
void *p;
if (!info->pool_count || info->free + size > info->end) {
+ if (size > POOL_SIZE)
+ die("BUG: pool size too small for %d in paint_alloc()",
+ size);
info->pool_count++;
REALLOC_ARRAY(info->pools, info->pool_count);
info->free = xmalloc(POOL_SIZE);
--
2.8.2.524.g6ff3d78
next prev parent reply other threads:[~2016-12-06 12:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 20:31 [PATCH 1/4] shallow.c: make paint_alloc slightly more robust Rasmus Villemoes
2016-12-02 20:31 ` [PATCH 2/4] shallow.c: avoid theoretical pointer wrap-around Rasmus Villemoes
2016-12-03 5:17 ` Jeff King
2016-12-02 20:31 ` [PATCH 3/4] shallow.c: bit manipulation tweaks Rasmus Villemoes
2016-12-03 5:21 ` Jeff King
2016-12-02 20:31 ` [PATCH 4/4] shallow.c: remove useless test Rasmus Villemoes
2016-12-03 5:24 ` Jeff King
2016-12-05 12:00 ` Duy Nguyen
2016-12-03 5:14 ` [PATCH 1/4] shallow.c: make paint_alloc slightly more robust Jeff King
2016-12-05 10:02 ` Duy Nguyen
2016-12-06 12:53 ` [PATCH v2 0/6] shallow.c improvements Nguyễn Thái Ngọc Duy
2016-12-06 12:53 ` [PATCH v2 1/6] shallow.c: rename fields in paint_info to better express their purposes Nguyễn Thái Ngọc Duy
2016-12-06 12:53 ` [PATCH v2 2/6] shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools Nguyễn Thái Ngọc Duy
2016-12-06 12:53 ` Nguyễn Thái Ngọc Duy [this message]
2016-12-06 12:53 ` [PATCH v2 4/6] shallow.c: avoid theoretical pointer wrap-around Nguyễn Thái Ngọc Duy
2016-12-06 12:53 ` [PATCH v2 5/6] shallow.c: bit manipulation tweaks Nguyễn Thái Ngọc Duy
2016-12-06 12:53 ` [PATCH v2 6/6] shallow.c: remove useless code Nguyễn Thái Ngọc Duy
2016-12-06 13:42 ` [PATCH v2 0/6] shallow.c improvements Jeff King
2016-12-06 13:47 ` Duy Nguyen
2016-12-07 23:42 ` 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=20161206125339.16803-4-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=rv@rasmusvillemoes.dk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.