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 devpollObject
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit 74a36055341cd0f268b534a9f37d6e89243bfaee
20 changes: 12 additions & 8 deletions Modules/selectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,8 @@ typedef struct {
struct pollfd *fds;
} devpollObject;

#define devpollObject_CAST(op) ((devpollObject *)(op))

static PyObject *
devpoll_err_closed(void)
{
Expand Down Expand Up @@ -1091,13 +1093,14 @@ select_devpoll_close_impl(devpollObject *self)
Py_RETURN_NONE;
}

static PyObject*
devpoll_get_closed(devpollObject *self, void *Py_UNUSED(ignored))
static PyObject *
devpoll_get_closed(PyObject *op, void *Py_UNUSED(closure))
{
if (self->fd_devpoll < 0)
devpollObject *self = devpollObject_CAST(op);
if (self->fd_devpoll < 0) {
Py_RETURN_TRUE;
else
Py_RETURN_FALSE;
}
Py_RETURN_FALSE;
}

/*[clinic input]
Expand All @@ -1117,7 +1120,7 @@ select_devpoll_fileno_impl(devpollObject *self)
}

static PyGetSetDef devpoll_getsetlist[] = {
{"closed", (getter)devpoll_get_closed, NULL,
{"closed", devpoll_get_closed, NULL,
"True if the devpoll object is closed"},
{0},
};
Expand Down Expand Up @@ -1168,9 +1171,10 @@ newDevPollObject(PyObject *module)
}

static void
devpoll_dealloc(devpollObject *self)
devpoll_dealloc(PyObject *op)
{
PyObject *type = (PyObject *)Py_TYPE(self);
devpollObject *self = devpollObject_CAST(op);
PyTypeObject *type = Py_TYPE(self);
(void)devpoll_internal_close(self);
PyMem_Free(self->fds);
PyObject_Free(self);
Expand Down