Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Srujith A Poojary via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Phillip Wood <phillip.wood123@gmail.com>,
	 Srujith A Poojary <poojarysrujith@gmail.com>
Subject: Re: [PATCH v5] diff-delta: use safe integer arithmetic
Date: Mon, 26 Oct 2026 10:37:25 -0700	[thread overview]
Message-ID: <xmqqpkwwqs6i.fsf@gitster.g> (raw)
In-Reply-To: <pull.2276.v5.git.1792956031588.gitgitgadget@gmail.com> (Srujith A. Poojary via GitGitGadget's message of "Sun, 25 Oct 2026 19:20:31 +0000")

"Srujith A Poojary via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Srujith A Poojary <poojarysrujith@gmail.com>
>
> In create_delta_index(), buffer sizes for allocating the delta index
> are calculated using arithmetic operations on entries and hsize:
>
>   memsize = sizeof(*hash) * hsize + sizeof(*entry) * entries
>
> To prevent potential size_t wrap-around when computing allocation sizes
> on 32-bit systems, replace manual arithmetic with overflow-checked
> helpers (st_mult, st_add, st_add3).
>
> For the unpacked index allocation:
> - sizeof(struct unpacked_index_entry) is 12 bytes on 32-bit systems,
>   which may be padded to 16 bytes depending on compiler alignment rules.
> - sizeof(struct index_entry *) is 4 bytes.
> - entries is capped by (0xffffffu / RABIN_WINDOW) where RABIN_WINDOW is 16,
>   limiting entries to 1,048,575.
> - hsize is the smallest power of 2 greater than or equal to entries,
>   capped at 1,048,576.
>
> While entries is bounded in current code, using st_mult() and st_add()
> guarantees that any unexpected growth in struct sizes or bounds changes
> will safely die() on size_t overflow instead of wrapping around.

Much more useful for future developers to learn what led to the
conclusion.

> For the packed index allocation:
> - Passing (hsize + 1) as an argument to st_add3() is safe from overflow
>   because hsize is capped at 1,048,576 early in the function.

hsize+1 is *not* an argument to st_add3(), though.  It is given to
st_mult().

  reply	other threads:[~2026-10-26 17:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-23  3:56 [PATCH] [Outreachy PATCH] diff-delta: use safe integer arithmetic Srujith A Poojary via GitGitGadget
2026-10-23  5:04 ` Junio C Hamano
2026-10-23  5:29   ` Srujith Poojary
2026-10-23 15:30     ` Junio C Hamano
2026-10-23 16:56       ` Srujith Poojary
2026-10-23 18:45         ` Junio C Hamano
2026-10-23  5:56 ` [PATCH v2] " Srujith A Poojary via GitGitGadget
2026-10-23 15:15   ` Phillip Wood
2026-10-23 18:49     ` Junio C Hamano
2026-10-24  3:44       ` Srujith Poojary
2026-10-24  3:48 ` [PATCH v3] " Srujith A Poojary via GitGitGadget
2026-10-24 16:15   ` Junio C Hamano
2026-10-24 17:26     ` Srujith Poojary
2026-10-25 18:10       ` Junio C Hamano
2026-10-25 19:21         ` Srujith Poojary
2026-10-24 18:00 ` [PATCH v4] " Srujith A Poojary via GitGitGadget
2026-10-25 19:20 ` [PATCH v5] " Srujith A Poojary via GitGitGadget
2026-10-26 17:37   ` Junio C Hamano [this message]
2026-10-26 18:47     ` Srujith Poojary

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=xmqqpkwwqs6i.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=poojarysrujith@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