Skip to content

gh-111178: fix UBSan failures in Modules/selectmodule.c #129792

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

gh-111178: fix UBSan failures in Modules/selectmodule.c #129792

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1791bf0
fix UBSan failures for `pollObject`
picnixz Feb 6, 2025
74a3605
fix UBSan failures for `devpollObject`
picnixz Feb 6, 2025
ff0d904
fix UBSan failures for `pyEpoll_Object`
picnixz Feb 6, 2025
08462e8
fix UBSan failures for `kqueue_event_Object`
picnixz Feb 6, 2025
bfbed25
fix UBSan failures for `kqueue_tracking_after_fork`
picnixz Feb 6, 2025
bfb9b81
fix UBSan failures for `kqueue_queue_Object`
picnixz Feb 6, 2025
abd3754
suppress unused return values
picnixz Feb 6, 2025
5042aa8
Merge remote-tracking branch 'upstream/main' into fix/ubsan/select-11…
picnixz Feb 7, 2025
6f30e55
fix compilation
picnixz Feb 7, 2025
8a1c309
fix compilation
picnixz Feb 7, 2025
7a0ca33
fix semantic naming
picnixz Feb 22, 2025
ff6a56d
Merge branch 'main' into fix/ubsan/select-111178
picnixz Feb 22, 2025
91dfee4
declare `_select_exec` function as being static
picnixz Feb 23, 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 kqueue_event_Object
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit 08462e86f23309813e28f6c8f41dcf2fa1ce13e0
22 changes: 14 additions & 8 deletions Modules/selectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,8 @@ typedef struct {
struct kevent e;
} kqueue_event_Object;

#define kqueue_event_Check(op, state) (PyObject_TypeCheck((op), state->kqueue_event_Type))
#define kqueue_event_Object_CAST(op) ((kqueue_event_Object *)(op))
#define kqueue_event_Check(op, state) (PyObject_TypeCheck((op), state->kqueue_event_Type))

typedef struct kqueue_queue_Object {
PyObject_HEAD
Expand Down Expand Up @@ -1889,9 +1890,9 @@ static struct PyMemberDef kqueue_event_members[] = {
#undef KQ_OFF

static PyObject *

kqueue_event_repr(kqueue_event_Object *s)
kqueue_event_repr(PyObject *op)
{
kqueue_event_Object *s = kqueue_event_Object_CAST(op);
return PyUnicode_FromFormat(
"<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
"data=0x%llx udata=%p>",
Expand All @@ -1900,7 +1901,7 @@ kqueue_event_repr(kqueue_event_Object *s)
}

static int
kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
kqueue_event_init(PyObject *op, PyObject *args, PyObject *kwds)
{
PyObject *pfd;
static char *kwlist[] = {"ident", "filter", "flags", "fflags",
Expand All @@ -1909,11 +1910,14 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
FILTER_FMT_UNIT FLAGS_FMT_UNIT FFLAGS_FMT_UNIT DATA_FMT_UNIT
UINTPTRT_FMT_UNIT ":kevent";

kqueue_event_Object *self = kqueue_event_Object_CAST(op);
EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */

if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
&pfd, &(self->e.filter), &(self->e.flags),
&(self->e.fflags), &(self->e.data), &(self->e.udata))) {
&pfd, &(self->e.filter),
&(self->e.flags), &(self->e.fflags),
&(self->e.data), &(self->e.udata)))
{
return -1;
}

Expand All @@ -1930,8 +1934,7 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
}

static PyObject *
kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o,
int op)
kqueue_event_richcompare(PyObject *lhs, PyObject *rhs, int op)
{
int result;
_selectstate *state = _selectstate_by_type(Py_TYPE(s));
Expand All @@ -1940,6 +1943,9 @@ kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o,
Py_RETURN_NOTIMPLEMENTED;
}

kqueue_event_Object *s = kqueue_event_Object_CAST(lhs);
kqueue_event_Object *o = (kqueue_event_Object *)rhs; // fast cast

#define CMP(a, b) ((a) != (b)) ? ((a) < (b) ? -1 : 1)
result = CMP(s->e.ident, o->e.ident)
: CMP(s->e.filter, o->e.filter)
Expand Down