Skip to content

gh-143376: validate usages of _interpchannels.ChannelID in _channelid_shared #146574

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

Open
picnixz wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −0
Open

gh-143376: validate usages of _interpchannels.ChannelID in _channelid_shared #146574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions Lib/test/test_interpreters/test_channels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,30 @@ def test_highlevel_reloaded(self):
# See gh-115490 (https://github.com/python/cpython/issues/115490).
importlib.reload(channels)

def test_channel_id_types(self):
# See https://github.com/python/cpython/issues/143376.
class End:
__slots__ = ()
def __new__(cls, chan=None):
return object.__new__(cls)
@property
def _id(self):
return object()

class Send(End): pass
class Recv(End): pass

_ = importlib.reload(_channels)
_._register_end_types(Send, Recv)
chan = _._channel_id(_.create(), _resolve=True)
interp = interpreters.create()
# The TypeError exception arises from our internal check,
# but subinterpreters use a generic exception message instead
# while retaining the original exception type.
err = "does not support cross-interpreter data"
with self.assertRaisesRegex(TypeError, err):
interp.prepare_main(chan=Send(chan))


class TestChannels(TestBase):

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2026-03-28-14-34-18.gh-issue-143376.FvWTwi.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`concurrent.interpreters`: fix a crash when internal cross-interpreter
channel ends have incorrect channel IDs. Patch by Bénédikt Tran.
11 changes: 11 additions & 0 deletions Modules/_interpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2633,6 +2633,17 @@ _channelid_from_xid(_PyXIData_t *data)
static int
_channelid_shared(PyThreadState *tstate, PyObject *obj, _PyXIData_t *data)
{
module_state *st = _get_current_module_state();
if (st == NULL) {
return -1;
}
if (!PyObject_IsInstance(obj, (PyObject *)st->ChannelIDType)) {
PyErr_Format(PyExc_TypeError,
"'_id' attribute must be an %N object, not %T",
st->ChannelIDType, obj);
return -1;
}

if (_PyXIData_InitWithSize(
data, tstate->interp, sizeof(struct _channelid_xid), obj,
_channelid_from_xid
Expand Down
Loading