-
-
Notifications
You must be signed in to change notification settings - Fork 34.5k
gh-143988: tation crashes in socket sendmsg/recvmsg_into via __buffer__
#143987
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.
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
base: main
Are you sure you want to change the base?
Changes from 1 commit
2c8aad6
e0f92e6
12c8272
b578feb
df46bde
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7491,6 +7491,78 @@ def detach(): | |
| pass | ||
|
|
||
|
|
||
| class ReentrantMutationTests(unittest.TestCase): | ||
| """Regression tests for re-entrant mutation vulnerabilities in sendmsg/recvmsg_into. | ||
| These tests verify that mutating sequences during argument parsing | ||
| via __buffer__ protocol does not cause crashes. | ||
| See: https://github.com/python/cpython/issues/143988 | ||
| """ | ||
|
|
||
| @unittest.skipUnless(hasattr(socket.socket, "sendmsg"), | ||
| "sendmsg not supported") | ||
| def test_sendmsg_reentrant_data_mutation(self): | ||
| # Test that sendmsg() handles re-entrant mutation of data buffers | ||
| # via __buffer__ protocol. | ||
| # See: https://github.com/python/cpython/issues/143988 | ||
| seq = [] | ||
|
|
||
| class MutBuffer: | ||
| def __init__(self): | ||
| self.tripped = False | ||
|
|
||
| def __buffer__(self, flags): | ||
| if not self.tripped: | ||
| self.tripped = True | ||
| seq.clear() | ||
| return memoryview(b'Hello') | ||
|
|
||
| seq = [MutBuffer(), b'World', b'Test'] | ||
|
|
||
| left, right = socket.socketpair() | ||
| self.addCleanup(left.close) | ||
| self.addCleanup(right.close) | ||
| # Should not crash. With the fix, the call succeeds; | ||
| # without the fix, it would crash (SIGSEGV). | ||
| try: | ||
| left.sendmsg(seq) | ||
| except (TypeError, OSError): | ||
| pass # Also acceptable | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove the useless comments. It is obvious that we do not want a crash. However, I want to know why we silence the exceptions. Ideally we want an exact exception catching (whatever it is) with assertRaises or there should be no exception at all. |
||
|
|
||
| @unittest.skipUnless(hasattr(socket.socket, "recvmsg_into"), | ||
| "recvmsg_into not supported") | ||
| def test_recvmsg_into_reentrant_buffer_mutation(self): | ||
| # Test that recvmsg_into() handles re-entrant mutation of buffers | ||
| # via __buffer__ protocol. | ||
| # See: https://github.com/python/cpython/issues/143988 | ||
| seq = [] | ||
|
|
||
| class MutBuffer: | ||
| def __init__(self, data): | ||
| self._data = bytearray(data) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here as well you do not need the attribute I guess. |
||
| self.tripped = False | ||
|
|
||
| def __buffer__(self, flags): | ||
| if not self.tripped: | ||
| self.tripped = True | ||
| seq.clear() | ||
| return memoryview(self._data) | ||
|
|
||
| seq = [MutBuffer(b'x' * 100), bytearray(100), bytearray(100)] | ||
|
|
||
| left, right = socket.socketpair() | ||
| self.addCleanup(left.close) | ||
| self.addCleanup(right.close) | ||
| left.send(b'Hello World!') | ||
| # Should not crash. With the fix, the call succeeds; | ||
| # without the fix, it would crash (SIGSEGV). | ||
| try: | ||
| right.recvmsg_into(seq) | ||
| except (TypeError, OSError): | ||
| pass # Also acceptable | ||
|
|
||
|
|
||
| def setUpModule(): | ||
| thread_info = threading_helper.threading_setup() | ||
| unittest.addModuleCleanup(threading_helper.threading_cleanup, *thread_info) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Fixed crashes in :meth:`socket.socket.sendmsg` and :meth:`socket.socket.recvmsg_into` | ||
| that could occur if buffer sequences are mutated re-entrantly during argument parsing | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| via ``__buffer__`` protocol callbacks. | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4527,11 +4527,13 @@ sock_recvmsg_into(PyObject *self, PyObject *args) | |
| &buffers_arg, &ancbufsize, &flags)) | ||
| return NULL; | ||
|
|
||
| if ((fast = PySequence_Fast(buffers_arg, | ||
| "recvmsg_into() argument 1 must be an " | ||
| "iterable")) == NULL) | ||
| fast = PySequence_Tuple(buffers_arg); | ||
| if (fast == NULL) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "recvmsg_into() argument 1 must be an iterable"); | ||
| return NULL; | ||
| nitems = PySequence_Fast_GET_SIZE(fast); | ||
| } | ||
| nitems = PyTuple_GET_SIZE(fast); | ||
| if (nitems > INT_MAX) { | ||
| PyErr_SetString(PyExc_OSError, "recvmsg_into() argument 1 is too long"); | ||
| goto finally; | ||
|
|
@@ -4545,7 +4547,7 @@ sock_recvmsg_into(PyObject *self, PyObject *args) | |
| goto finally; | ||
| } | ||
| for (; nbufs < nitems; nbufs++) { | ||
| if (!PyArg_Parse(PySequence_Fast_GET_ITEM(fast, nbufs), | ||
| if (!PyArg_Parse(PyTuple_GET_ITEM(fast, nbufs), | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am a bit confused with this one. There is nothing that checks for the fact that this really a buffer object or did I forget about PyArg_Parse? |
||
| "w*;recvmsg_into() argument 1 must be an iterable " | ||
| "of single-segment read-write buffers", | ||
| &bufs[nbufs])) | ||
|
|
@@ -4854,14 +4856,14 @@ sock_sendmsg_iovec(PySocketSockObject *s, PyObject *data_arg, | |
|
|
||
| /* Fill in an iovec for each message part, and save the Py_buffer | ||
| structs to release afterwards. */ | ||
| data_fast = PySequence_Fast(data_arg, | ||
| "sendmsg() argument 1 must be an " | ||
| "iterable"); | ||
| data_fast = PySequence_Tuple(data_arg); | ||
| if (data_fast == NULL) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "sendmsg() argument 1 must be an iterable"); | ||
| goto finally; | ||
| } | ||
|
|
||
| ndataparts = PySequence_Fast_GET_SIZE(data_fast); | ||
| ndataparts = PyTuple_GET_SIZE(data_fast); | ||
| if (ndataparts > INT_MAX) { | ||
| PyErr_SetString(PyExc_OSError, "sendmsg() argument 1 is too long"); | ||
| goto finally; | ||
|
|
@@ -4883,7 +4885,7 @@ sock_sendmsg_iovec(PySocketSockObject *s, PyObject *data_arg, | |
| } | ||
| } | ||
| for (; ndatabufs < ndataparts; ndatabufs++) { | ||
| if (PyObject_GetBuffer(PySequence_Fast_GET_ITEM(data_fast, ndatabufs), | ||
| if (PyObject_GetBuffer(PyTuple_GET_ITEM(data_fast, ndatabufs), | ||
| &databufs[ndatabufs], PyBUF_SIMPLE) < 0) | ||
| goto finally; | ||
| iovs[ndatabufs].iov_base = databufs[ndatabufs].buf; | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a refwrence to the gh issue as well. Using plain comments and
"See: URL TO THE ISSUE."
And not just gh-XXXXXX. URLs can be opened directly from IDEs, but not gh-* objects.