GeezerVison is showing github.com — gh-159786: Convert HACL* update() errors in `_hmac` after releasing the lock by picnixz · Pull Request #159805 · python/cpython
Conversation
picnixz
commented
Oct 19, 2026
•
edited by gpshead
Loading
Uh oh!
There was an error while loading. Please reload this page.
_hacl_hmac_state_update_once() converted the HACL* exit code into an exception while the thread state was detached and, for HMAC.update(), while the object's mutex was held. On debug builds, this re-attached the thread state under the mutex and then called PyErr_Occurred() with the thread state detached in the chunking loop of _hacl_hmac_state_update().
Return the raw HACL* exit code instead and convert it in _hmac.new() and _hmac.HMAC.update() once the thread state is re-attached and the mutex is released, as hmac_digest_compute_locked() already does. Release builds now also check for the error making for far simpler code. The actual trigger for an error from hacl was an unrealistically large data size.
Since _hacl_convert_errno() is now always called with an attached thread state, remove the PyGILState_Ensure() added by gh-135561 and assert that a thread state is attached instead.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
…sing the lock
`_hacl_hmac_state_update_once()` converted the HACL* exit code into an
exception while the thread state was detached and, for HMAC.update(),
while the object's mutex was held. On debug builds, this re-attached the
thread state under the mutex and then called PyErr_Occurred() with the
thread state detached in the chunking loop of `_hacl_hmac_state_update()`.
Return the raw HACL* exit code instead and convert it in `_hmac.new()` and
`_hmac.HMAC.update()` once the thread state is re-attached and the mutex
is released, as `hmac_digest_compute_locked()` already does. Release
builds keep ignoring the update() exit code.
Since `_hacl_convert_errno()` is now always called with an attached
thread state, remove the `PyGILState_Ensure()` added by pythongh-135561 and
assert that a thread state is attached instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a commit... lets also simplify and always check for the error regardless of debug build or not.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
picnixz reacted with thumbs up emoji
Uh oh!
There was an error while loading. Please reload this page.
|
Thanks @picnixz for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.15.
🐍🍒⛏🤖
|
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
picnixz
added a commit
that referenced
this pull request
Oct 20, 2026
…asing the lock (GH-159805) (#159825)
gh-159786: Convert HACL* update() errors in `_hmac` after releasing the lock (GH-159805)
* gh-159786: Convert HACL* update() errors in `_hmac` after releasing the lock
`_hacl_hmac_state_update_once()` converted the HACL* exit code into an
exception while the thread state was detached and, for HMAC.update(),
while the object's mutex was held. On debug builds, this re-attached the
thread state under the mutex and then called PyErr_Occurred() with the
thread state detached in the chunking loop of `_hacl_hmac_state_update()`.
Return the raw HACL* exit code instead and convert it in `_hmac.new()` and
`_hmac.HMAC.update()` once the thread state is re-attached and the mutex
is released, as `hmac_digest_compute_locked()` already does. Release
builds keep ignoring the update() exit code.
Since `_hacl_convert_errno()` is now always called with an attached
thread state, remove the `PyGILState_Ensure()` added by gh-135561 and
assert that a thread state is attached instead.
* simplify ifdefs: always check for the hacl error
---------
(cherry picked from commit 0fba211)
Co-authored-by: Bénédikt Tran <[email protected]>
Co-authored-by: Gregory P. Smith <[email protected]>
Reviewers
gpshead
gpshead approved these changes
Uh oh!
There was an error while loading. Please reload this page.
Milestone
No milestone
Development
Successfully merging this pull request may close these issues.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
|