From: "ノウラ | Flare via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "ノウラ | Flare" <nouraellm@gmail.com>, ノウラ <nea@odoo.com>
Subject: [PATCH] reset slab_alloc and state fields in clear_alloc_state()
Date: Tue, 26 Aug 2025 19:57:48 +0000 [thread overview]
Message-ID: <pull.2040.git.git.1756238268790.gitgitgadget@gmail.com> (raw)
From: =?UTF-8?q?=E3=83=8E=E3=82=A6=E3=83=A9?= <nea@odoo.com>
clear_alloc_state() freed all slabs and nulled the slabs pointer but
left slab_alloc, nr, and p unchanged. If the alloc_state is reused,
ALLOC_GROW() can wrongly assume that the slab array is already
allocated because slab_alloc still holds a stale nonzero capacity.
In that case s->slabs remains NULL and the next dereference writes
through a NULL pointer, causing undefined behavior.
To fix this, we reset slab_alloc, nr, and p to zero/NULL after
freeing the slabs. This leaves alloc_state in a consistent empty
state for reuse and avoids dangling pointers.
Signed-off-by: Noura EL ALLAM <nouraellm@gmail.com>
---
Reset slab_alloc and state fields in clear_alloc_state()
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2040%2Fnouraellm%2Ffix-dangling-pointer-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2040/nouraellm/fix-dangling-pointer-v1
Pull-Request: https://github.com/git/git/pull/2040
alloc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/alloc.c b/alloc.c
index 377e80f5dda..6bf9421c123 100644
--- a/alloc.c
+++ b/alloc.c
@@ -49,6 +49,9 @@ void clear_alloc_state(struct alloc_state *s)
}
FREE_AND_NULL(s->slabs);
+ s->slab_alloc = 0;
+ s->nr = 0;
+ s->p = NULL;
}
static inline void *alloc_node(struct alloc_state *s, size_t node_size)
base-commit: f814da676ae46aac5be0a98b99373a76dee6cedb
--
gitgitgadget
next reply other threads:[~2025-08-26 19:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-26 19:57 ノウラ | Flare via GitGitGadget [this message]
2025-08-27 2:07 ` [PATCH] reset slab_alloc and state fields in clear_alloc_state() Junio C Hamano
2025-08-27 23:28 ` [PATCH v2] alloc: fix dangling pointer in alloc_state cleanup ノウラ | Flare via GitGitGadget
2025-08-28 19:29 ` Torsten Bögershausen
2025-08-28 19:47 ` Junio C Hamano
2025-08-28 20:01 ` Junio C Hamano
2025-08-29 13:00 ` [PATCH v3] " ノウラ | Flare via GitGitGadget
2025-09-03 11:18 ` Jeff King
2025-09-03 21:59 ` Junio C Hamano
2025-09-03 23:17 ` [PATCH v4] " ノウラ | Flare via GitGitGadget
2025-09-04 7:47 ` Junio C Hamano
2025-09-04 13:25 ` ノウラ | Flare
2025-09-04 16:43 ` Junio C Hamano
2025-09-04 17:44 ` [PATCH v5] " ノウラ | Flare via GitGitGadget
2025-09-04 20:25 ` Junio C Hamano
2025-09-04 20:49 ` Jeff King
2025-09-04 22:26 ` Junio C Hamano
2025-09-05 0:02 ` ノウラ | Flare
2025-09-05 13:23 ` Jeff King
2025-09-05 17:27 ` ノウラ | Flare
2025-09-05 0:07 ` ノウラ | Flare
2025-09-05 0:25 ` ノウラ | Flare
2025-09-05 1:03 ` ノウラ | Flare
2025-09-05 14:39 ` Junio C Hamano
2025-09-05 17:47 ` ノウラ | Flare
2025-09-05 13:15 ` Jeff King
2025-09-05 18:51 ` [PATCH v6] " ノウラ | Flare via GitGitGadget
2025-09-05 19:37 ` 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=pull.2040.git.git.1756238268790.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=nea@odoo.com \
--cc=nouraellm@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;
as well as URLs for NNTP newsgroup(s).