From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <derrickstolee@github.com>,
Abhradeep Chakraborty <chakrabortyabhradeep79@gmail.com>,
Jeff King <peff@peff.net>
Subject: [PATCH 5/6] pack-bitmap.c: use `bitmap_index_seek()` where possible
Date: Mon, 20 Mar 2023 16:02:52 -0400 [thread overview]
Message-ID: <9a3e45b78b7810e0116848f1de80096b04285a55.1679342296.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1679342296.git.me@ttaylorr.com>
As described in the previous commit, now that we have a functional
`bitmap_index_seek()`, rewrite all callers that manually manipulate the
`map_pos` variable with calls to `bitmap_index_seek()`.
This means that all callers that adjust the value of `map_pos` have
those changes automatically bounds- and overflow-checked.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
pack-bitmap.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/pack-bitmap.c b/pack-bitmap.c
index fabcf01c14..38a3c6a3f9 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -174,7 +174,7 @@ static struct ewah_bitmap *read_bitmap_1(struct bitmap_index *index)
return NULL;
}
- index->map_pos += bitmap_size;
+ bitmap_index_seek(index, bitmap_size, SEEK_CUR);
return b;
}
@@ -230,7 +230,7 @@ static int load_bitmap_header(struct bitmap_index *index)
index->entry_count = ntohl(header->entry_count);
index->checksum = header->checksum;
- index->map_pos += header_size;
+ bitmap_index_seek(index, header_size, SEEK_CUR);
return 0;
}
@@ -269,13 +269,15 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
static uint32_t read_be32(struct bitmap_index *bitmap_git)
{
uint32_t result = get_be32(bitmap_git->map + bitmap_git->map_pos);
- bitmap_git->map_pos += sizeof(result);
+ bitmap_index_seek(bitmap_git, sizeof(uint32_t), SEEK_CUR);
return result;
}
static uint8_t read_u8(struct bitmap_index *bitmap_git)
{
- return bitmap_git->map[bitmap_git->map_pos++];
+ uint8_t result = bitmap_git->map[bitmap_git->map_pos];
+ bitmap_index_seek(bitmap_git, sizeof(uint8_t), SEEK_CUR);
+ return result;
}
#define MAX_XOR_OFFSET 160
@@ -794,14 +796,16 @@ static struct stored_bitmap *lazy_bitmap_for_commit(struct bitmap_index *bitmap_
while (xor_items_nr) {
xor_item = &xor_items[xor_items_nr - 1];
- bitmap_git->map_pos = xor_item->offset;
+ bitmap_index_seek(bitmap_git, xor_item->offset, SEEK_SET);
+
if (bitmap_git->map_size - bitmap_git->map_pos < bitmap_header_size) {
error(_("corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""),
oid_to_hex(&xor_item->oid));
goto corrupt;
}
- bitmap_git->map_pos += sizeof(uint32_t) + sizeof(uint8_t);
+ bitmap_index_seek(bitmap_git,
+ sizeof(uint32_t) + sizeof(uint8_t), SEEK_CUR);
xor_flags = read_u8(bitmap_git);
bitmap = read_bitmap_1(bitmap_git);
@@ -812,7 +816,7 @@ static struct stored_bitmap *lazy_bitmap_for_commit(struct bitmap_index *bitmap_
xor_items_nr--;
}
- bitmap_git->map_pos = offset;
+ bitmap_index_seek(bitmap_git, offset, SEEK_SET);
if (bitmap_git->map_size - bitmap_git->map_pos < bitmap_header_size) {
error(_("corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""),
oid_to_hex(oid));
@@ -842,7 +846,8 @@ static struct stored_bitmap *lazy_bitmap_for_commit(struct bitmap_index *bitmap_
* Instead, we can skip ahead and immediately read the flags and
* ewah bitmap.
*/
- bitmap_git->map_pos += sizeof(uint32_t) + sizeof(uint8_t);
+ bitmap_index_seek(bitmap_git, sizeof(uint32_t) + sizeof(uint8_t),
+ SEEK_CUR);
flags = read_u8(bitmap_git);
bitmap = read_bitmap_1(bitmap_git);
--
2.40.0.77.gd564125b3f
next prev parent reply other threads:[~2023-03-20 20:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 20:02 [PATCH 0/6] pack-bitmap: miscellaneous mmap read hardening Taylor Blau
2023-03-20 20:02 ` [PATCH 1/6] pack-bitmap.c: hide bitmap internals in `read_u8()` Taylor Blau
2023-03-21 17:35 ` Jeff King
2023-03-24 17:52 ` Derrick Stolee
2023-03-20 20:02 ` [PATCH 2/6] pack-bitmap.c: hide bitmap internals in `read_be32()` Taylor Blau
2023-03-20 20:02 ` [PATCH 3/6] pack-bitmap.c: drop unnecessary 'inline's Taylor Blau
2023-03-21 17:40 ` Jeff King
2023-03-20 20:02 ` [PATCH 4/6] pack-bitmap.c: factor out manual `map_pos` manipulation Taylor Blau
2023-03-21 17:56 ` Jeff King
2023-03-24 18:04 ` Derrick Stolee
2023-03-24 18:29 ` Jeff King
2023-03-24 23:23 ` Taylor Blau
2023-03-25 4:57 ` Jeff King
2023-03-24 23:13 ` Taylor Blau
2023-03-24 23:24 ` Taylor Blau
2023-03-24 23:08 ` Taylor Blau
2023-03-20 20:02 ` Taylor Blau [this message]
2023-03-21 18:05 ` [PATCH 5/6] pack-bitmap.c: use `bitmap_index_seek()` where possible Jeff King
2023-03-24 18:06 ` Derrick Stolee
2023-03-24 18:35 ` Jeff King
2023-03-24 19:43 ` Junio C Hamano
2023-03-24 20:37 ` Jeff King
2023-03-24 21:38 ` Junio C Hamano
2023-03-24 22:57 ` Taylor Blau
2023-03-20 20:02 ` [PATCH 6/6] pack-bitmap.c: factor out `bitmap_index_seek_commit()` Taylor Blau
2023-03-21 18:13 ` Jeff King
2023-03-21 18:16 ` Taylor Blau
2023-03-21 18:27 ` Jeff King
2023-03-24 18:09 ` Derrick Stolee
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a3e45b78b7810e0116848f1de80096b04285a55.1679342296.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=chakrabortyabhradeep79@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).