From: Taylor Blau <me@ttaylorr.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/9] commit-graph: handle overflow in chunk_size checks
Date: Thu, 9 Nov 2023 16:13:17 -0500 [thread overview]
Message-ID: <ZU1LbV0/ciDdO1aD@nand.local> (raw)
In-Reply-To: <20231109070948.GA2698043@coredump.intra.peff.net>
On Thu, Nov 09, 2023 at 02:09:48AM -0500, Jeff King wrote:
> So instead, we can do a division like this:
>
> if (chunk_size / GRAPH_DATA_WIDTH != g->num_commits)
>
> where there's no possibility of overflow. We do lose a little bit of
> precision; due to integer division truncation we'd allow up to an extra
> GRAPH_DATA_WIDTH-1 bytes of data in the chunk. That's OK. Our main goal
> here is making sure we don't have too _few_ bytes, which would cause an
> out-of-bounds read (we could actually replace our "!=" with "<", but I
> think it's worth being a little pedantic, as a large mismatch could be a
> sign of other problems).
This is wonderfully explained, and the patch below follows trivially
from what you wrote here.
So everything in this patch makes sense and looks good to me. It does
make me think about the pair_chunk_expect() function that I proposed
elsewhere. I haven't yet read the rest of the series, so it may be a
totally useless direction by the end of this series ;-).
But I wonder if the interface we want is something like:
int pair_chunk_expect(struct chunkfile *cf, uint32_t chunk_id,
const unsigned char **p,
size_t record_size, size_t record_nr);
So we can then grab the size of the chunk, divide it by "record_size"
and ensure that end up with "record_nr" as a result.
Again, this is perhaps totally useless by the end of your series, but
just having looked at the first patch I wonder if this is a productive
direction to consider...
Thanks,
Taylor
next prev parent reply other threads:[~2023-11-09 21:13 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-09 7:03 [PATCH 0/9] some more chunk-file bounds-checks fixes Jeff King
2023-11-09 7:09 ` [PATCH 1/9] commit-graph: handle overflow in chunk_size checks Jeff King
2023-11-09 21:13 ` Taylor Blau [this message]
2023-11-09 21:27 ` Jeff King
2023-11-09 7:12 ` [PATCH 2/9] midx: check consistency of fanout table Jeff King
2023-11-09 7:13 ` [PATCH 3/9] commit-graph: drop redundant call to "lite" verification Jeff King
2023-11-09 7:14 ` [PATCH 4/9] commit-graph: clarify missing-chunk error messages Jeff King
2023-11-09 7:17 ` [PATCH 5/9] commit-graph: abort as soon as we see a bogus chunk Jeff King
2023-11-09 21:18 ` Taylor Blau
2023-11-09 7:24 ` [PATCH 6/9] commit-graph: use fanout value for graph size Jeff King
2023-11-09 21:20 ` Taylor Blau
2023-11-09 21:38 ` Jeff King
2023-11-09 22:15 ` Taylor Blau
2023-11-10 21:52 ` Jeff King
2023-11-09 7:25 ` [PATCH 7/9] commit-graph: check order while reading fanout chunk Jeff King
2023-11-09 7:25 ` [PATCH 8/9] commit-graph: drop verify_commit_graph_lite() Jeff King
2023-11-09 7:26 ` [PATCH 9/9] commit-graph: mark chunk error messages for translation Jeff King
2023-11-09 21:22 ` [PATCH 0/9] some more chunk-file bounds-checks fixes Taylor Blau
2023-11-09 22:34 ` [PATCH 0/7] chunk-format: introduce `pair_chunk_expect()` Taylor Blau
2023-11-09 22:34 ` [PATCH 1/7] chunk-format: introduce `pair_chunk_expect()` helper Taylor Blau
2023-11-10 4:55 ` Junio C Hamano
2023-11-10 16:27 ` Taylor Blau
2023-11-10 22:01 ` Jeff King
2023-11-10 23:39 ` Junio C Hamano
2023-11-10 23:38 ` Junio C Hamano
2023-11-10 21:57 ` Jeff King
2023-11-10 22:09 ` Jeff King
2023-11-10 22:08 ` Jeff King
2024-01-15 22:31 ` Linus Arver
2024-01-15 22:53 ` Linus Arver
2024-01-16 15:10 ` Jeff King
2024-01-18 23:59 ` Linus Arver
2023-11-09 22:34 ` [PATCH 2/7] commit-graph: read `OIDL` chunk with `pair_chunk_expect()` Taylor Blau
2023-11-10 22:10 ` Jeff King
2023-11-09 22:34 ` [PATCH 3/7] commit-graph: read `CDAT` " Taylor Blau
2023-11-09 22:34 ` [PATCH 4/7] commit-graph: read `GDAT` " Taylor Blau
2023-11-09 22:34 ` [PATCH 5/7] commit-graph: read `BIDX` " Taylor Blau
2023-11-09 22:34 ` [PATCH 6/7] midx: read `OIDL` " Taylor Blau
2023-11-09 22:34 ` [PATCH 7/7] midx: read `OOFF` " Taylor Blau
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=ZU1LbV0/ciDdO1aD@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--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).