Skip to content

gh-111178: fix UBSan failures in Modules/_ssl.c #130719

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
encukou merged 10 commits into from
Mar 17, 2025
Merged

gh-111178: fix UBSan failures in Modules/_ssl.c #130719

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
801a41c
fix UBSan failures for `PySSLContext`
picnixz Feb 8, 2025
e1c5020
fix UBSan failures for `PySSLSocket`
picnixz Feb 8, 2025
e101a98
fix UBSan failures for `PySSLMemoryBIO`
picnixz Feb 8, 2025
d734c1e
fix UBSan failures for `PySSLSession`
picnixz Feb 8, 2025
fe9f918
Do not use `_` + capital letter in cast macros as it is also UB.
picnixz Feb 8, 2025
9a88242
Merge remote-tracking branch 'upstream/main' into fix/ubsan/ssl-111178
picnixz Mar 1, 2025
58d5d42
Merge remote-tracking branch 'upstream/main' into fix/ubsan/ssl-111178
picnixz Mar 1, 2025
62cfada
Assume (and then assert, a bit too late) that left is of the right type
encukou Mar 5, 2025
dc0a521
Victor's review (part 1)
picnixz Mar 16, 2025
9a4079c
Update Modules/_ssl.c
picnixz Mar 16, 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 UBSan failures for PySSLSession
  • Loading branch information
@picnixz
picnixz committed Feb 8, 2025
commit d734c1e8cb8258ff27b25f28f1e3d098de1bda30
14 changes: 10 additions & 4 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ typedef struct {
PySSLContext *ctx;
} PySSLSession;

#define PySSLSession_CAST(op) ((PySSLSession *)(op))

static inline _PySSLError _PySSL_errno(int failed, const SSL *ssl, int retcode)
{
_PySSLError err = { 0 };
Expand Down Expand Up @@ -5509,8 +5511,9 @@ static PyType_Spec PySSLMemoryBIO_spec = {
*/

static void
PySSLSession_dealloc(PySSLSession *self)
PySSLSession_dealloc(PyObject *op)
{
PySSLSession *self = PySSLSession_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
/* bpo-31095: UnTrack is needed before calling any callbacks */
PyObject_GC_UnTrack(self);
Expand All @@ -5531,7 +5534,8 @@ PySSLSession_richcompare(PyObject *left, PyObject *right, int op)
}

int result;
PyTypeObject *sesstype = ((PySSLSession*)left)->ctx->state->PySSLSession_Type;
_sslmodulestate *state = get_state_obj(left);
PyTypeObject *sesstype = state->PySSLSession_Type;
Comment thread
picnixz marked this conversation as resolved.
Outdated

if (!Py_IS_TYPE(left, sesstype) || !Py_IS_TYPE(right, sesstype)) {
Py_RETURN_NOTIMPLEMENTED;
Expand Down Expand Up @@ -5581,16 +5585,18 @@ PySSLSession_richcompare(PyObject *left, PyObject *right, int op)
}

static int
PySSLSession_traverse(PySSLSession *self, visitproc visit, void *arg)
PySSLSession_traverse(PyObject *op, visitproc visit, void *arg)
{
PySSLSession *self = PySSLSession_CAST(op);
Py_VISIT(self->ctx);
Py_VISIT(Py_TYPE(self));
return 0;
}

static int
PySSLSession_clear(PySSLSession *self)
PySSLSession_clear(PyObject *op)
{
PySSLSession *self = PySSLSession_CAST(op);
Py_CLEAR(self->ctx);
return 0;
}
Expand Down