Skip to content

gh-134698: Hold a lock when the thread state is detached in ssl #134724

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

Merged
merged 10 commits into from
Jul 25, 2025
Merged

gh-134698: Hold a lock when the thread state is detached in ssl #134724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ffb568
Lock when the thread state is detached.
ZeroIntensity May 26, 2025
d0e0668
Add a test.
ZeroIntensity May 26, 2025
16cab83
Add blurb.
ZeroIntensity May 26, 2025
ece939a
Use global constant in the test.
ZeroIntensity May 26, 2025
18da64f
Zero-out the mutex and don't try to reacquire it in a callback.
ZeroIntensity May 26, 2025
4f6928d
Remove generated test file.
ZeroIntensity May 26, 2025
13d2e7d
Lock the context when creating a new SSL socket.
ZeroIntensity May 26, 2025
d2f5cc1
Fix _PySSL_FIX_ERRNO silliness.
ZeroIntensity May 26, 2025
d40d1b4
Merge branch 'main' into fix-ssl-race
gpshead Jul 25, 2025
39323ab
Also update the new `_ssl__SSLSocket_sendfile_impl`
gpshead Jul 25, 2025
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
Prev Previous commit
Next Next commit
Fix _PySSL_FIX_ERRNO silliness.
  • Loading branch information
@ZeroIntensity
ZeroIntensity committed May 26, 2025
commit d2f5cc1c0235b71aa3910c9d2610c5624c3eca09
1 change: 0 additions & 1 deletion Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,6 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
PySSL_BEGIN_ALLOW_THREADS(sslctx)
self->ssl = SSL_new(ctx);
PySSL_END_ALLOW_THREADS(sslctx)
_PySSL_FIX_ERRNO;
if (self->ssl == NULL) {
Py_DECREF(self);
_setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
Expand Down
1 change: 1 addition & 0 deletions Modules/_ssl/debughelpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ _PySSLContext_set_keylog_filename(PyObject *op, PyObject *arg,
Py_BEGIN_ALLOW_THREADS
BIO_free_all(bio);
Py_END_ALLOW_THREADS
_PySSL_FIX_ERRNO;
}

if (arg == Py_None) {
Expand Down
Loading