Skip to content

gh-155833: GC-untrack MD5/SHA* objects before freeing the HACL* state #155834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
picnixz wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −9
Open

gh-155833: GC-untrack MD5/SHA* objects before freeing the HACL* state #155834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2026-08-15-12-08-33.gh-issue-155833.Pi2Yjp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure that MD5 and SHA* objects are properly GC-untracked before freeing
their internal HACL* state. Patch by Bénédikt Tran.
4 changes: 2 additions & 2 deletions Modules/md5module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ newMD5object(MD5State * st)
static void
MD5_dealloc(PyObject *op)
{
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(op);
MD5object *ptr = _MD5object_CAST(op);
if (ptr->hash_state != NULL) {
Hacl_Hash_MD5_free(ptr->hash_state);
ptr->hash_state = NULL;
}
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(ptr);
PyObject_GC_Del(ptr);
Py_DECREF(tp);
}
Expand Down
5 changes: 3 additions & 2 deletions Modules/sha1module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ newSHA1object(SHA1State *st)
return NULL;
}
HASHLIB_INIT_MUTEX(sha);
sha->hash_state = NULL; // PyObject_GC_New() does not zero memory

PyObject_GC_Track(sha);
return sha;
Expand All @@ -85,13 +86,13 @@ newSHA1object(SHA1State *st)
static void
SHA1_dealloc(PyObject *op)
{
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(op);
SHA1object *ptr = _SHA1object_CAST(op);
if (ptr->hash_state != NULL) {
Hacl_Hash_SHA1_free(ptr->hash_state);
ptr->hash_state = NULL;
}
PyTypeObject *tp = Py_TYPE(ptr);
PyObject_GC_UnTrack(ptr);
PyObject_GC_Del(ptr);
Py_DECREF(tp);
}
Expand Down
10 changes: 6 additions & 4 deletions Modules/sha2module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ newSHA384object(sha2_state *state)
return NULL;
}
HASHLIB_INIT_MUTEX(sha);
sha->state = NULL; // PyObject_GC_New() does not zero memory

PyObject_GC_Track(sha);
return sha;
Expand All @@ -159,6 +160,7 @@ newSHA512object(sha2_state *state)
return NULL;
}
HASHLIB_INIT_MUTEX(sha);
sha->state = NULL; // PyObject_GC_New() does not zero memory

PyObject_GC_Track(sha);
return sha;
Expand All @@ -168,27 +170,27 @@ newSHA512object(sha2_state *state)
static void
SHA256_dealloc(PyObject *op)
{
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(op);
SHA256object *ptr = _SHA256object_CAST(op);
if (ptr->state != NULL) {
Hacl_Hash_SHA2_free_256(ptr->state);
ptr->state = NULL;
}
PyTypeObject *tp = Py_TYPE(ptr);
PyObject_GC_UnTrack(ptr);
PyObject_GC_Del(ptr);
Py_DECREF(tp);
}

static void
SHA512_dealloc(PyObject *op)
{
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(op);
SHA512object *ptr = _SHA512object_CAST(op);
if (ptr->state != NULL) {
Hacl_Hash_SHA2_free_512(ptr->state);
ptr->state = NULL;
}
PyTypeObject *tp = Py_TYPE(ptr);
PyObject_GC_UnTrack(ptr);
PyObject_GC_Del(ptr);
Py_DECREF(tp);
}
Expand Down
3 changes: 2 additions & 1 deletion Modules/sha3module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ newSHA3object(PyTypeObject *type)
return NULL;
}
HASHLIB_INIT_MUTEX(newobj);
newobj->hash_state = NULL; // PyObject_GC_New() does not zero memory

PyObject_GC_Track(newobj);
return newobj;
Expand Down Expand Up @@ -223,7 +224,7 @@ SHA3_dealloc(PyObject *self)
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
(void)SHA3_clear(self);
tp->tp_free(self);
PyObject_GC_Del(self);
Py_DECREF(tp);
}

Expand Down
Loading