git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4] diff-delta: use safe integer arithmetic

From
SGSrujith A Poojary via GitGitGadget <gitgitgadget@gmail.com>
Date
Oct 24, 2026, 18:00 UTC
Message-ID
<pull.2276.v4.git.1792864857176.gitgitgadget@gmail.com>
In-Reply-To
<pull.2276.git.1792727808109.gitgitgadget@gmail.com>
From: Srujith A Poojary <poojarysrujith@gmail.com>

Replace manual multiplication and addition in create_delta_index() with safe integer helpers (st_mult, st_add, st_add3) to prevent potential overflows when computing memory allocation sizes.

For the unpacked index, we allocate hsize instances of hash pointers and
entries instances of struct index_entry:
  - hsize is capped at 2^26.
  - entries is capped at 2^28.
On 32-bit platforms with 4-byte padding for struct unpacked_index_entry,
the calculation size (sizeof(*hash) * hsize + sizeof(*entry) * entries) can
exceed 2^32, making safe integer arithmetic necessary.

Similarly, for the packed index, we compute allocation size across struct index, packed_hash, and entries. Using safe helpers prevents wrap-around across both allocations.

Note that passing (hsize + 1) as an argument to st_add3() is safe from overflow because hsize is capped at 2^26 early in the function.

Signed-off-by: Srujith A Poojary <poojarysrujith@gmail.com>
---
    [Outreachy PATCH] diff-delta: use safe integer arithmetic
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2276%2Fpoojarysrujith%2Fc-refactor-target-name-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2276/poojarysrujith/c-refactor-target-name-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/2276
Range-diff vs v3:
 1:  d288bfe9e3 ! 1:  0d5a729cde diff-delta: use safe integer arithmetic
     @@ Commit message
          with safe integer helpers (st_mult, st_add, st_add3) to prevent potential
          overflows when computing memory allocation sizes.
      
     -    On 32-bit platforms, struct alignment padding could cause the total
     -    allocation size calculation to exceed 2^32, making safe integer arithmetic
     -    necessary. Note that hsize + 1 inside st_add3() is safe from overflow
     -    because hsize is capped at 2^26 early in the function.
     +    For the unpacked index, we allocate hsize instances of hash pointers and
     +    entries instances of struct index_entry:
     +      - hsize is capped at 2^26.
     +      - entries is capped at 2^28.
     +    On 32-bit platforms with 4-byte padding for struct unpacked_index_entry,
     +    the calculation size (sizeof(*hash) * hsize + sizeof(*entry) * entries) can
     +    exceed 2^32, making safe integer arithmetic necessary.
     +
     +    Similarly, for the packed index, we compute allocation size across
     +    struct index, packed_hash, and entries. Using safe helpers prevents
     +    wrap-around across both allocations.
     +
     +    Note that passing (hsize + 1) as an argument to st_add3() is safe from
     +    overflow because hsize is capped at 2^26 early in the function.
      
          Signed-off-by: Srujith A Poojary <poojarysrujith@gmail.com>
      
 diff-delta.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/diff-delta.c b/diff-delta.c
index 7cbedeb507..efebce3aca 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -162,8 +162,8 @@ struct delta_index * create_delta_index(const void *buf, size_t bufsize)
 	hmask = hsize - 1;
 
 	/* allocate lookup index */
-	memsize = sizeof(*hash) * hsize +
-		  sizeof(*entry) * entries;
+	memsize = st_add(st_mult(sizeof(*hash), hsize),
+			 st_mult(sizeof(*entry), entries));
 	mem = malloc(memsize);
 	if (!mem)
 		return NULL;
@@ -258,9 +258,9 @@ struct delta_index * create_delta_index(const void *buf, size_t bufsize)
 	 * Now create the packed index in array form
 	 * rather than linked lists.
 	 */
-	memsize = sizeof(*index)
-		+ sizeof(*packed_hash) * (hsize+1)
-		+ sizeof(*packed_entry) * entries;
+	memsize = st_add3(sizeof(*index),
+			  st_mult(sizeof(*packed_hash), hsize + 1),
+			  st_mult(sizeof(*packed_entry), entries));
 	mem = malloc(memsize);
 	if (!mem) {
 		free(hash);

base-commit: 47fdf2208c5b94c8cc01c106b8f7c85efb91c926
-- 
gitgitgadget
Previous: Srujith PoojaryNext: Srujith A Poojary via GitGitGadget
Message 16 of 31 in “diff-delta: use safe integer arithmetic”
  1. [Outreachy PATCH] diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 23, 2026
  2. Junio C HamanoOct 23, 2026
  3. Srujith PoojaryOct 23, 2026
  4. Junio C HamanoOct 23, 2026
  5. Srujith PoojaryOct 23, 2026
  6. Junio C HamanoOct 23, 2026
  7. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 23, 2026
  8. Phillip WoodOct 23, 2026
  9. Junio C HamanoOct 23, 2026
  10. Srujith PoojaryOct 24, 2026
  11. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 24, 2026
  12. Junio C HamanoOct 24, 2026
  13. Srujith PoojaryOct 24, 2026
  14. Junio C HamanoOct 25, 2026
  15. Srujith PoojaryOct 25, 2026
  16. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 24, 2026
  17. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 25, 2026
  18. Junio C HamanoOct 26, 2026
  19. Srujith PoojaryOct 26, 2026
  20. Srujith PoojaryOct 27, 2026
  21. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 27, 2026
  22. Pablo SabaterOct 27, 2026
  23. Srujith PoojaryOct 27, 2026
  24. Pablo SabaterOct 27, 2026
  25. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 27, 2026
  26. Pablo SabaterOct 27, 2026
  27. Srujith PoojaryOct 27, 2026
  28. Junio C HamanoOct 27, 2026
  29. Srujith PoojaryOct 27, 2026
  30. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 27, 2026
  31. diff-delta: use safe integer arithmeticSrujith A Poojary via GitGitGadget, Oct 27, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.