Skip to content

gh-111178: fix UBSan failures in Modules/overlapped.c #129786

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 5 commits into from
Feb 20, 2025
+20 −9
Merged

gh-111178: fix UBSan failures in Modules/overlapped.c #129786

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3043f80
fix UBSan failures for `OverlappedObject`
picnixz Feb 6, 2025
b6fdbb6
Merge remote-tracking branch 'upstream/main' into fix/ubsan/overlappe…
picnixz Feb 7, 2025
39c7792
fix compilation
picnixz Feb 8, 2025
4619843
simplify the PR
picnixz Feb 8, 2025
599b909
Merge branch 'main' into fix/ubsan/overlapped-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
Next Next commit
fix UBSan failures for OverlappedObject
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit 3043f80bbd54b846edb2ac3f6a1af21abb1b017a
23 changes: 15 additions & 8 deletions Modules/overlapped.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ typedef struct {
};
} OverlappedObject;

#define OverlappedObject_CAST(op) ((OverlappedObject *)(op))


static inline void
steal_buffer(Py_buffer * dst, Py_buffer * src)
Expand Down Expand Up @@ -668,8 +670,9 @@ _overlapped_Overlapped_impl(PyTypeObject *type, HANDLE event)
/* Note (bpo-32710): OverlappedType.tp_clear is not defined to not release
buffers while overlapped are still running, to prevent a crash. */
static int
Overlapped_clear(OverlappedObject *self)
Overlapped_clear(PyObject *op)
{
OverlappedObject *self = OverlappedObject_CAST(op);
switch (self->type) {
case TYPE_READ:
case TYPE_ACCEPT: {
Expand Down Expand Up @@ -713,12 +716,13 @@ Overlapped_clear(OverlappedObject *self)
}

static void
Overlapped_dealloc(OverlappedObject *self)
Overlapped_dealloc(PyObject *op)
{
DWORD bytes;
DWORD olderr = GetLastError();
BOOL wait = FALSE;
BOOL ret;
OverlappedObject *self = OverlappedObject_CAST(op);

if (!HasOverlappedIoCompleted(&self->overlapped) &&
self->type != TYPE_NOT_STARTED)
Expand Down Expand Up @@ -767,7 +771,7 @@ Overlapped_dealloc(OverlappedObject *self)
CloseHandle(self->overlapped.hEvent);
}

Overlapped_clear(self);
(void)Overlapped_clear(op);
SetLastError(olderr);

PyTypeObject *tp = Py_TYPE(self);
Expand Down Expand Up @@ -1641,21 +1645,24 @@ _overlapped_Overlapped_ConnectPipe_impl(OverlappedObject *self,
}

static PyObject*
Overlapped_getaddress(OverlappedObject *self)
Overlapped_getaddress(PyObject *op, void *Py_UNUSED(closure))
{
OverlappedObject *self = OverlappedObject_CAST(op);
return PyLong_FromVoidPtr(&self->overlapped);
}

static PyObject*
Overlapped_getpending(OverlappedObject *self)
Overlapped_getpending(PyObject *op, void *Py_UNUSED(closure))
{
OverlappedObject *self = OverlappedObject_CAST(op);
return PyBool_FromLong(!HasOverlappedIoCompleted(&self->overlapped) &&
self->type != TYPE_NOT_STARTED);
}

static int
Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
Overlapped_traverse(PyObject *op, visitproc visit, void *arg)
{
OverlappedObject *self = OverlappedObject_CAST(op);
switch (self->type) {
case TYPE_READ:
case TYPE_ACCEPT:
Expand Down Expand Up @@ -1975,9 +1982,9 @@ static PyMemberDef Overlapped_members[] = {
};

static PyGetSetDef Overlapped_getsets[] = {
{"address", (getter)Overlapped_getaddress, NULL,
{"address", Overlapped_getaddress, NULL,
"Address of overlapped structure"},
{"pending", (getter)Overlapped_getpending, NULL,
{"pending", Overlapped_getpending, NULL,
"Whether the operation is pending"},
{NULL},
};
Expand Down