Skip to content

gh-111178: fix UBSan failures in Modules/_io/*.c #129083

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

gh-111178: fix UBSan failures in Modules/_io/*.c #129083

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
37bc556
fix UBSan failures for `buffered`
picnixz Jan 20, 2025
36f5adc
fix UBSan failures for `rwpair`
picnixz Jan 20, 2025
2a02293
fix UBSan failures for `bytesio`
picnixz Jan 20, 2025
fc3cd12
fix UBSan failures for `bytesiobuf`
picnixz Jan 20, 2025
cd728f5
fix UBSan failures for `iobase`
picnixz Jan 20, 2025
0da5a81
fix UBSan failures for `stringio`
picnixz Jan 20, 2025
9889af8
fix UBSan failures for `nldecoder_object`
picnixz Jan 20, 2025
19ed68d
fix UBSan failures for `textio`
picnixz Jan 20, 2025
249ec3e
fix UBSan failures for `winconsoleio`
picnixz Jan 20, 2025
cf44141
reduce diff
picnixz Jan 20, 2025
a9b3ca6
add some new lines
picnixz Jan 20, 2025
9cb97c2
Merge remote-tracking branch 'upstream/main' into fix/ubsan/io-111178
picnixz Jan 25, 2025
416d740
post-merge fix
picnixz Jan 25, 2025
c6f2d0e
use 'ignored' for NOARGS method and 'args' for others
picnixz Feb 6, 2025
ec1e15d
use 'dummy' for NOARGS method
picnixz Feb 6, 2025
14c0684
Merge remote-tracking branch 'upstream/main' into fix/ubsan/io-111178
picnixz Feb 7, 2025
b192d6c
Merge branch 'main' into fix/ubsan/io-111178
picnixz Feb 7, 2025
bb95ac0
Do not add an underscore to the macro if none is needed.
picnixz Feb 8, 2025
2340cae
Do Do not use `_` + capital letter in cast macros as it is also UB.
picnixz Feb 8, 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
Do Do not use _ + capital letter in cast macros as it is also UB.
  • Loading branch information
@picnixz
picnixz committed Feb 8, 2025
commit 2340cae3030ee80583c302880c3ee87ecde929b9
24 changes: 12 additions & 12 deletions Modules/_io/fileio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ typedef struct {
} fileio;

#define PyFileIO_Check(state, op) (PyObject_TypeCheck((op), state->PyFileIO_Type))
#define _PyFileIO_CAST(op) _Py_CAST(fileio*, (op))
#define PyFileIO_CAST(op) ((fileio *)(op))

/* Forward declarations */
static PyObject* portable_lseek(fileio *self, PyObject *posobj, int whence, bool suppress_pipe_error);

int
_PyFileIO_closed(PyObject *self)
{
return (_PyFileIO_CAST(self)->fd < 0);
return (PyFileIO_CAST(self)->fd < 0);
}

/* Because this can call arbitrary code, it shouldn't be called when
Expand All @@ -100,7 +100,7 @@ _PyFileIO_closed(PyObject *self)
static PyObject *
fileio_dealloc_warn(PyObject *op, PyObject *source)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
if (self->fd >= 0 && self->closefd) {
PyObject *exc = PyErr_GetRaisedException();
if (PyErr_ResourceWarning(source, 1, "unclosed file %R", source)) {
Expand Down Expand Up @@ -542,7 +542,7 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
static int
fileio_traverse(PyObject *op, visitproc visit, void *arg)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->dict);
return 0;
Expand All @@ -551,15 +551,15 @@ fileio_traverse(PyObject *op, visitproc visit, void *arg)
static int
fileio_clear(PyObject *op)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
Py_CLEAR(self->dict);
return 0;
}

static void
fileio_dealloc(PyObject *op)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
self->finalizing = 1;
if (_PyIOBase_finalize(op) < 0) {
return;
Expand Down Expand Up @@ -1161,7 +1161,7 @@ mode_string(fileio *self)
static PyObject *
fileio_repr(PyObject *op)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
const char *type_name = Py_TYPE(self)->tp_name;

if (self->fd < 0) {
Expand Down Expand Up @@ -1229,7 +1229,7 @@ _io_FileIO_isatty_impl(fileio *self)
static PyObject *
_io_FileIO_isatty_open_only(PyObject *op, PyObject *Py_UNUSED(dummy))
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
if (self->stat_atopen != NULL && !S_ISCHR(self->stat_atopen->st_mode)) {
Py_RETURN_FALSE;
}
Expand Down Expand Up @@ -1264,28 +1264,28 @@ static PyMethodDef fileio_methods[] = {
static PyObject *
fileio_get_closed(PyObject *op, void *closure)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
return PyBool_FromLong((long)(self->fd < 0));
}

static PyObject *
fileio_get_closefd(PyObject *op, void *closure)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
return PyBool_FromLong((long)(self->closefd));
}

static PyObject *
fileio_get_mode(PyObject *op, void *closure)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
return PyUnicode_FromString(mode_string(self));
}

static PyObject *
fileio_get_blksize(PyObject *op, void *closure)
{
fileio *self = _PyFileIO_CAST(op);
fileio *self = PyFileIO_CAST(op);
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
if (self->stat_atopen != NULL && self->stat_atopen->st_blksize > 1) {
return PyLong_FromLong(self->stat_atopen->st_blksize);
Expand Down