Skip to content

gh-111178: fix UBSan failures in Modules/_lsprof.c #129782

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 5 commits into from
Feb 17, 2025
Merged

gh-111178: fix UBSan failures in Modules/_lsprof.c #129782

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9efd31
fix UBSan failures for `ProfilerObject`
picnixz Jan 25, 2025
893b198
suppress unused return values
picnixz Jan 25, 2025
a4bb87b
Merge remote-tracking branch 'upstream/main' into fix/ubsan/lsprof-11…
picnixz Feb 7, 2025
4112725
Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
99e5d5d
Merge branch 'main' into fix/ubsan/lsprof-111178
encukou Feb 17, 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
26 changes: 15 additions & 11 deletions Modules/_lsprof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ typedef struct {
PyObject* missing;
} ProfilerObject;

#define ProfilerObject_CAST(op) ((ProfilerObject *)(op))

#define POF_ENABLED 0x001
#define POF_SUBCALLS 0x002
#define POF_BUILTINS 0x004
Expand Down Expand Up @@ -921,30 +923,32 @@ _lsprof_Profiler_clear_impl(ProfilerObject *self)
}

static int
profiler_traverse(ProfilerObject *op, visitproc visit, void *arg)
profiler_traverse(PyObject *op, visitproc visit, void *arg)
{
ProfilerObject *self = ProfilerObject_CAST(op);
Py_VISIT(Py_TYPE(op));
Py_VISIT(op->externalTimer);
Py_VISIT(self->externalTimer);
return 0;
}

static void
profiler_dealloc(ProfilerObject *op)
profiler_dealloc(PyObject *op)
{
PyObject_GC_UnTrack(op);
if (op->flags & POF_ENABLED) {
ProfilerObject *self = ProfilerObject_CAST(op);
PyObject_GC_UnTrack(self);
if (self->flags & POF_ENABLED) {
PyThreadState *tstate = _PyThreadState_GET();
if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {
PyErr_FormatUnraisable("Exception ignored while "
"destroying _lsprof profiler");
}
}

flush_unmatched(op);
clearEntries(op);
Py_XDECREF(op->externalTimer);
PyTypeObject *tp = Py_TYPE(op);
tp->tp_free(op);
flush_unmatched(self);
clearEntries(self);
Py_XDECREF(self->externalTimer);
PyTypeObject *tp = Py_TYPE(self);
tp->tp_free(self);
Py_DECREF(tp);
}

Expand Down Expand Up @@ -1045,7 +1049,7 @@ _lsprof_clear(PyObject *module)
static void
_lsprof_free(void *module)
{
_lsprof_clear((PyObject *)module);
(void)_lsprof_clear((PyObject *)module);
}

static int
Expand Down
Loading