Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.14] gh-135561: ensure that the GIL is held when handling an HACL* error in _hmac (GH-135562) (#135725)

Browse source 
gh-135561: ensure that the GIL is held when handling an HACL* error in `_hmac` (GH-135562)
(cherry picked from commit c765683398)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2025-06-19 21:48:29 +02:00 • committed by GitHub
parent 8caf3fdacb
commit 83e0ab17f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Library/2025-06-16-15-03-03.gh-issue-135561.mJCN8D.rst Normal file
View file

@ -0,0 +1,2 @@
Fix a crash on DEBUG builds when an HACL* HMAC routine fails. Patch by
Bénédikt Tran.

21
Modules/hmacmodule.c
View file

@ -493,36 +493,41 @@ narrow_hmac_hash_kind(hmacmodule_state *state, HMAC_Hash_Kind kind)
static int static int
_hacl_convert_errno(hacl_errno_t code, PyObject *algorithm) _hacl_convert_errno(hacl_errno_t code, PyObject *algorithm)
{ {
assert(PyGILState_GetThisThreadState() != NULL);
if (code == Hacl_Streaming_Types_Success) {
return 0;
}
PyGILState_STATE gstate = PyGILState_Ensure();
switch (code) { switch (code) {
case Hacl_Streaming_Types_Success: {
return 0;
}
case Hacl_Streaming_Types_InvalidAlgorithm: { case Hacl_Streaming_Types_InvalidAlgorithm: {
// only makes sense if an algorithm is known at call time // only makes sense if an algorithm is known at call time
assert(algorithm != NULL); assert(algorithm != NULL);
assert(PyUnicode_CheckExact(algorithm)); assert(PyUnicode_CheckExact(algorithm));
PyErr_Format(PyExc_ValueError, "invalid algorithm: %U", algorithm); PyErr_Format(PyExc_ValueError, "invalid algorithm: %U", algorithm);
return -1; break;
} }
case Hacl_Streaming_Types_InvalidLength: { case Hacl_Streaming_Types_InvalidLength: {
PyErr_SetString(PyExc_ValueError, "invalid length"); PyErr_SetString(PyExc_ValueError, "invalid length");
return -1; break;
} }
case Hacl_Streaming_Types_MaximumLengthExceeded: { case Hacl_Streaming_Types_MaximumLengthExceeded: {
PyErr_SetString(PyExc_OverflowError, "maximum length exceeded"); PyErr_SetString(PyExc_OverflowError, "maximum length exceeded");
return -1; break;
} }
case Hacl_Streaming_Types_OutOfMemory: { case Hacl_Streaming_Types_OutOfMemory: {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; break;
} }
default: { default: {
PyErr_Format(PyExc_RuntimeError, PyErr_Format(PyExc_RuntimeError,
"HACL* internal routine failed with error code: %d", "HACL* internal routine failed with error code: %d",
code); code);
return -1; break;
} }
} }
PyGILState_Release(gstate);
return -1;
} }
/* /*