8000 gh-111178: fix UBSan failures in `Modules/_pickle.c` by picnixz · Pull Request #129787 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-111178: fix UBSan failures in Modules/_pickle.c #129787

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
merged 10 commits into from
Feb 20, 2025
Merged

gh-111178: fix UBSan failures in Modules/_pickle.c #129787

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
47cddff
fix UBSan failures for `Pdata`
picnixz Jan 25, 2025
61da4f2
fix UBSan failures for `PicklerObject`
picnixz Jan 25, 2025
d1e782c
fix UBSan failures for `UnpicklerObject`
picnixz Jan 25, 2025
0b1d726
fix UBSan failures for `PicklerMemoProxyObject`
picnixz Jan 25, 2025
e3bcf30
fix UBSan failures for `UnpicklerMemoProxyObject`
picnixz Jan 25, 2025
fc28046
indicate safe fast cast to avoid redundant future checks
picnixz Jan 25, 2025
d019c95
use semantically correct parameter names
picnixz Feb 6, 2025
8c290f6
Merge remote-tracking branch 'upstream/main' into fix/ubsan/pickle-11…
picnixz Feb 7, 2025
2e46447
Do Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
045b936
Merge branch 'main' into fix/ubsan/pickle-111178
encukou Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
< 8000 div class="select-menu-blankslate select-menu-error"> Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do Do not use _ + capital letter in new code as it is also UB.
  • Loading branch information
@picnixz
picnixz committed Feb 8, 2025
commit 2e4644761650df2646eaca33718720abcf2f55f6
48 changes: 24 additions & 24 deletions Modules/_pickle.c
View file
Open in desktop
< 7913 td id="diff-6a8bf1993db0eae81c2ee98e38eeb1ac4d9342b8b5c090f33417a064e6678562L7624" data-line-number="7624" class="blob-num blob-num-context js-linkable-line-number">
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ typedef struct {
Py_ssize_t allocated; /* number of slots in data allocated */
} Pdata;

#define _Pdata_CAST(op) ((Pdata *)(op))
#define Pdata_CAST(op) ((Pdata *)(op))

static int
Pdata_traverse(PyObject *self, visitproc visit, void *arg)
Expand All @@ -422,7 +422,7 @@ Pdata_traverse(PyObject *self, visitproc visit, void *arg)
static void
Pdata_dealloc(PyObject *op)
{
Pdata *self = _Pdata_CAST(op);
Pdata *self = Pdata_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
Py_ssize_t i = Py_SIZE(self);
Expand Down Expand Up @@ -699,10 +699,10 @@ typedef struct {
UnpicklerObject *unpickler;
} UnpicklerMemoProxyObject;

#define _PicklerObject_CAST(op) ((PicklerObject *)(op))
#define _UnpicklerObject_CAST(op) ((UnpicklerObject *)(op))
#define _PicklerMemoProxyObject_CAST(op) ((PicklerMemoProxyObject *)(op))
#define _UnpicklerMemoProxyObject_CAST(op) ((UnpicklerMemoProxyObject *)(op))
#define PicklerObject_CAST(op) ((PicklerObject *)(op))
#define UnpicklerObject_CAST(op) ((UnpicklerObject *)(op))
#define PicklerMemoProxyObject_CAST(op) ((PicklerMemoProxyObject *)(op))
#define UnpicklerMemoProxyObject_CAST(op) ((UnpicklerMemoProxyObject *)(op))

/* Forward declarations */
static int save(PickleState *state, PicklerObject *, PyObject *, int);
Expand Down 8000 Expand Up @@ -4730,7 +4730,7 @@ static struct PyMethodDef Pickler_methods[] = {
static int
Pickler_clear(PyObject *op)
{
PicklerObject *self = _PicklerObject_CAST(op);
PicklerObject *self = PicklerObject_CAST(op);
Py_CLEAR(self->output_buffer);
Py_CLEAR(self->write);
Py_CLEAR(self->persistent_id);
Expand Down Expand Up @@ -4760,7 +4760,7 @@ Pickler_dealloc(PyObject *self)
static int
Pickler_traverse(PyObject *op, visitproc visit, void *arg)
{
PicklerObject *self = _PicklerObject_CAST(op);
PicklerObject *self = PicklerObject_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->write);
Py_VISIT(self->persistent_id);
Expand Down Expand Up @@ -4984,7 +4984,7 @@ static PyMethodDef picklerproxy_methods[] = {
static void
PicklerMemoProxy_dealloc(PyObject *op)
{
PicklerMemoProxyObject *self = _PicklerMemoProxyObject_CAST(op);
PicklerMemoProxyObject *self = PicklerMemoProxyObject_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
Py_CLEAR(self->pickler);
Expand All @@ -4995,7 +4995,7 @@ PicklerMemoProxy_dealloc(PyObject *op)
static int
PicklerMemoProxy_traverse(PyObject *op, visitproc visit, void *arg)
{
PicklerMemoProxyObject *self = _PicklerMemoProxyObject_CAST(op);
PicklerMemoProxyObject *self = PicklerMemoProxyObject_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->pickler);
return 0;
Expand All @@ -5004,7 +5004,7 @@ PicklerMemoProxy_traverse(PyObject *op, visitproc visit, void *arg)
static int
PicklerMemoProxy_clear(PyObject *op)
{
PicklerMemoProxyObject *self = _PicklerMemoProxyObject_CAST(op);
PicklerMemoProxyObject *self = PicklerMemoProxyObject_CAST(op);
Py_CLEAR(self->pickler);
return 0;
}
Expand Down Expand Up @@ -5044,15 +5044,15 @@ PicklerMemoProxy_New(PicklerObject *pickler)
static PyObject *
Pickler_get_memo(PyObject *op, void *Py_UNUSED(closure))
{
PicklerObject *self = _PicklerObject_CAST(op);
PicklerObject *self = PicklerObject_CAST(op);
return PicklerMemoProxy_New(self);
}

static int
Pickler_set_memo(PyObject *op, PyObject *obj, void *Py_UNUSED(closure))
{
PyMemoTable *new_memo = NULL;
PicklerObject *self = _PicklerObject_CAST(op);
PicklerObject *self = PicklerObject_CAST(op);

if (obj == NULL) {
PyErr_SetString(PyExc_TypeError,
Expand Down Expand Up @@ -5115,7 +5115,7 @@ Pickler_set_memo(PyObject *op, PyObject *obj, void *Py_UNUSED(closure))
static PyObject *
Pickler_getattr(PyObject *self, PyObject *name)
{
PicklerObject *po = _PicklerObject_CAST(self);
PicklerObject *po = PicklerObject_CAST(self);
if (PyUnicode_Check(name)
&& PyUnicode_EqualToUTF8(name, "persistent_id")
&& po->persistent_id_attr)
Expand All @@ -5132,7 +5132,7 @@ Pickler_setattr(PyObject *self, PyObject *name, PyObject *value)
if (PyUnicode_Check(name)
&& PyUnicode_EqualToUTF8(name, "persistent_id"))
{
PicklerObject *po = _PicklerObject_CAST(self);
PicklerObject *po = PicklerObject_CAST(self);
Py_XINCREF(value);
Py_XSETREF(po->persistent_id_attr, value);
return 0;
Expand Down Expand Up @@ -7236,7 +7236,7 @@ static struct PyMethodDef Unpickler_methods[] = {
static int
Unpickler_clear(PyObject *op)
{
UnpicklerObject *self = _UnpicklerObject_CAST(op);
UnpicklerObject *self = UnpicklerObject_CAST(op);
Py_CLEAR(self->readline);
Py_CLEAR(self->readinto);
Py_CLEAR(self->read);
Expand Down Expand Up @@ -7275,7 +7275,7 @@ Unpickler_dealloc(PyObject *self)
static int
Unpickler_traverse(PyObject *op, visitproc visit, void *arg)
{
UnpicklerObject *self = _UnpicklerObject_CAST(op);
UnpicklerObject *self = UnpicklerObject_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->readline);
Py_VISIT(self->readinto);
Expand Down Expand Up @@ -7476,7 +7476,7 @@ static PyMethodDef unpicklerproxy_methods[] = {
static void
UnpicklerMemoProxy_dealloc(PyObject *op)
{
UnpicklerMemoProxyObject *self = _UnpicklerMemoProxyObject_CAST(op);
UnpicklerMemoProxyObject *self = UnpicklerMemoProxyObject_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
Py_CLEAR(self->unpickler);
Expand All @@ -7487,7 +7487,7 @@ UnpicklerMemoProxy_dealloc(PyObject *op)
static int
UnpicklerMemoProxy_traverse(PyObject *op, visitproc visit, void *arg)
{
UnpicklerMemoProxyObject *self = _UnpicklerMemoProxyObject_CAST(op);
UnpicklerMemoProxyObject *self = UnpicklerMemoProxyObject_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->unpickler);
return 0;
Expand All @@ -7496,7 +7496,7 @@ UnpicklerMemoProxy_traverse(PyObject *op, visitproc visit, void *arg)
static int
UnpicklerMemoProxy_clear(PyObject *op)
{
UnpicklerMemoProxyObject *self = _UnpicklerMemoProxyObject_CAST(op);
UnpicklerMemoProxyObject *self = UnpicklerMemoProxyObject_CAST(op);
Py_CLEAR(self->unpickler);
return 0;
}
Expand Down Expand Up @@ -7538,15 +7538,15 @@ UnpicklerMemoProxy_New(UnpicklerObject *unpickler)
static PyObject *
Unpickler_get_memo(PyObject *op, void *Py_UNUSED(closure))
{
UnpicklerObject *self = _UnpicklerObject_CAST(op);
UnpicklerObject *self = UnpicklerObject_CAST(op);
return UnpicklerMemoProxy_New(self);
}

static int
Unpickler_set_memo(PyObject *op, PyObject *obj, void *Py_UNUSED(closure))
{
PyObject **new_memo;
UnpicklerObject *self = _UnpicklerObject_CAST(op);
UnpicklerObject *self = UnpicklerObject_CAST(op);
size_t new_memo_size = 0;

if (obj == NULL) {
Expand Down Expand Up @@ -7623,7 +7623,7 @@ Unpickler_set_memo(PyObject *op, PyObject *obj, void *Py_UNUSED(closure))
static PyObject *
Unpickler_getattr(PyObject *self, PyObject *name)
{
UnpicklerObject *obj = _UnpicklerObject_CAST(self);
UnpicklerObject *obj = UnpicklerObject_CAST(self);
if (PyUnicode_Check(name)
&& PyUnicode_EqualToUTF8(name, "persistent_load")
&& obj->persistent_load_attr)
Expand All @@ -7640,7 +7640,7 @@ Unpickler_setattr(PyObject *self, PyObject *name, PyObject *value)
if (PyUnicode_Check(name)
&& PyUnicode_EqualToUTF8(name, "persistent_load"))
{
UnpicklerObject *obj = _UnpicklerObject_CAST(self);
UnpicklerObject *obj = UnpicklerObject_CAST(self);
Py_XINCREF(value);
Py_XSETREF(obj->persistent_load_attr, value);
return 0;
Expand Down
Loading
0