Skip to content

gh-111178: fix UBSan failures in Modules/_threadmodule.c #129794

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 12 commits into from
Feb 24, 2025
Merged

gh-111178: fix UBSan failures in Modules/_threadmodule.c #129794

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9447294
fix UBSan failures for `PyThreadHandleObject`
picnixz Jan 25, 2025
1083c46
use a macro for casts to `lockobject`
picnixz Jan 25, 2025
d7a39ae
fix UBSan failures for `rlockobject`
picnixz Jan 25, 2025
557dbd0
fix UBSan failures for `localdummyobject`
picnixz Jan 25, 2025
a96a296
fix UBSan failures for `localobject`
picnixz Jan 25, 2025
339a416
add safe casts
picnixz Jan 25, 2025
17ba461
cleanup module functions
picnixz Jan 25, 2025
4b3e706
use semantically correct parameter names
picnixz Feb 6, 2025
122f2ee
Merge remote-tracking branch 'upstream/main' into fix/ubsan/thread-11…
picnixz Feb 7, 2025
7a5ed41
Do Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
ce0eb11
Do not add an underscore to the macro if none is needed.
picnixz Feb 8, 2025
59a33e3
Merge branch 'main' into fix/ubsan/thread-111178
encukou Feb 18, 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
use a macro for casts to lockobject
  • Loading branch information
@picnixz
picnixz committed Jan 25, 2025
commit 1083c461cb2b00e331dd20b7c721fc2858ea2150
19 changes: 10 additions & 9 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,8 @@ typedef struct {
PyMutex lock;
} lockobject;

#define _lockobject_CAST(op) ((lockobject *)(op))

static int
lock_traverse(PyObject *self, visitproc visit, void *arg)
{
Expand All @@ -735,13 +737,12 @@ lock_traverse(PyObject *self, visitproc visit, void *arg)
}

static void
lock_dealloc(PyObject *op)
lock_dealloc(PyObject *self)
{
lockobject *self = (lockobject*)op;
PyObject_GC_UnTrack(self);
PyObject_ClearWeakRefs((PyObject *) self);
PyObject_ClearWeakRefs(self);
PyTypeObject *tp = Py_TYPE(self);
tp->tp_free((PyObject*)self);
tp->tp_free(self);
Py_DECREF(tp);
}

Expand Down Expand Up @@ -795,7 +796,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
static PyObject *
lock_PyThread_acquire_lock(PyObject *op, PyObject *args, PyObject *kwds)
{
lockobject *self = (lockobject*)op;
lockobject *self = _lockobject_CAST(op);

PyTime_t timeout;
if (lock_acquire_parse_args(args, kwds, &timeout) < 0) {
Expand Down Expand Up @@ -837,7 +838,7 @@ Lock the lock.");
static PyObject *
lock_PyThread_release_lock(PyObject *op, PyObject *Py_UNUSED(ignored))
{
lockobject *self = (lockobject*)op;
lockobject *self = _lockobject_CAST(op);
/* Sanity check: the lock must be locked */
if (_PyMutex_TryUnlock(&self->lock) < 0) {
PyErr_SetString(ThreadError, "release unlocked lock");
Expand Down Expand Up @@ -870,7 +871,7 @@ Release the lock.");
static PyObject *
lock_locked_lock(PyObject *op, PyObject *Py_UNUSED(ignored))
{
lockobject *self = (lockobject*)op;
lockobject *self = _lockobject_CAST(op);
return PyBool_FromLong(PyMutex_IsLocked(&self->lock));
}

Expand All @@ -889,7 +890,7 @@ An obsolete synonym of locked().");
static PyObject *
lock_repr(PyObject *op)
{
lockobject *self = (lockobject*)op;
lockobject *self = _lockobject_CAST(op);
return PyUnicode_FromFormat("<%s %s object at %p>",
PyMutex_IsLocked(&self->lock) ? "locked" : "unlocked", Py_TYPE(self)->tp_name, self);
}
Expand All @@ -898,7 +899,7 @@ lock_repr(PyObject *op)
static PyObject *
lock__at_fork_reinit(PyObject *op, PyObject *Py_UNUSED(args))
{
lockobject *self = (lockobject *)op;
lockobject *self = _lockobject_CAST(op);
_PyMutex_at_fork_reinit(&self->lock);
Py_RETURN_NONE;
}
Expand Down