Skip to content

gh-111178: fix UBSan failures in Modules/mmapmodule.c #129784

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 4 commits into from
Feb 19, 2025
Merged

gh-111178: fix UBSan failures in Modules/mmapmodule.c #129784

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa94478
fix UBSan failures for `mmap_object`
picnixz Feb 6, 2025
1abeaf6
use 'ignored' for NOARGS method and 'args' for others
picnixz Feb 6, 2025
b7203c7
Merge remote-tracking branch 'upstream/main' into fix/ubsan/mmap-111178
picnixz Feb 7, 2025
98d60ec
Merge branch 'main' into fix/ubsan/mmap-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
Prev Previous commit
Next Next commit
use 'ignored' for NOARGS method and 'args' for others
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit 1abeaf671bacca4bb708023d7549bcd5b7b0ff94
16 changes: 8 additions & 8 deletions Modules/mmapmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ mmap_object_dealloc(PyObject *op)
}

static PyObject *
mmap_close_method(PyObject *op, PyObject *Py_UNUSED(args))
mmap_close_method(PyObject *op, PyObject *Py_UNUSED(ignored))
{
mmap_object *self = mmap_object_CAST(op);
if (self->exports > 0) {
Expand Down Expand Up @@ -463,7 +463,7 @@ _safe_PyBytes_FromStringAndSize(char *start, size_t num_bytes) {
}

static PyObject *
mmap_read_byte_method(PyObject *op, PyObject *Py_UNUSED(args))
mmap_read_byte_method(PyObject *op, PyObject *Py_UNUSED(ignored))
{
mmap_object *self = mmap_object_CAST(op);
CHECK_VALID(NULL);
Expand All @@ -480,7 +480,7 @@ mmap_read_byte_method(PyObject *op, PyObject *Py_UNUSED(args))
}

static PyObject *
mmap_read_line_method(PyObject *op, PyObject *Py_UNUSED(args))
mmap_read_line_method(PyObject *op, PyObject *Py_UNUSED(ignored))
{
Py_ssize_t remaining;
char *start, *eol;
Expand Down Expand Up @@ -705,7 +705,7 @@ mmap_write_byte_method(PyObject *op, PyObject *args)
}

static PyObject *
mmap_size_method(PyObject *op, PyObject *Py_UNUSED(args))
mmap_size_method(PyObject *op, PyObject *Py_UNUSED(ignored))
{
mmap_object *self = mmap_object_CAST(op);
CHECK_VALID(NULL);
Expand Down Expand Up @@ -987,7 +987,7 @@ mmap_seek_method(PyObject *op, PyObject *args)
}

static PyObject *
mmap_seekable_method(PyObject *op, PyObject *Py_UNUSED(args))
mmap_seekable_method(PyObject *op, PyObject *Py_UNUSED(ignored))
{
Py_RETURN_TRUE;
}
Expand Down Expand Up @@ -1033,7 +1033,7 @@ mmap_closed_get(PyObject *op, void *Py_UNUSED(closure))
}

static PyObject *
mmap__enter__method(PyObject *op, PyObject *args)
mmap__enter__method(PyObject *op, PyObject *Py_UNUSED(ignored))
{
mmap_object *self = mmap_object_CAST(op);
CHECK_VALID(NULL);
Expand All @@ -1042,7 +1042,7 @@ mmap__enter__method(PyObject *op, PyObject *args)
}

static PyObject *
mmap__exit__method(PyObject *op, PyObject *args)
mmap__exit__method(PyObject *op, PyObject *Py_UNUSED(args))
{
return mmap_close_method(op, NULL);
}
Expand Down Expand Up @@ -1094,7 +1094,7 @@ mmap__repr__method(PyObject *op)

#ifdef MS_WINDOWS
static PyObject *
mmap__sizeof__method(PyObject *op, void *Py_UNUSED(args))
mmap__sizeof__method(PyObject *op, void *Py_UNUSED(ignored))
{
mmap_object *self = mmap_object_CAST(op);
size_t res = _PyObject_SIZE(Py_TYPE(self));
Expand Down