merge 3.3 (#20246)

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index bf4243212e3227ac38f36511523f9b482f980bb6..cce412a38cd94764f4c362b745592955cf9a039d 100644 (file)
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4683,6 +4683,14 @@ class BufferIOTest(SocketConnectedTest):
 
     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
 
+    def testRecvFromIntoSmallBuffer(self):
+        # See issue #20246.
+        buf = bytearray(8)
+        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
+
+    def _testRecvFromIntoSmallBuffer(self):
+        self.serv_conn.send(MSG*2048)
+
 
 TIPC_STYPE = 2000
 TIPC_LOWER = 200

diff --git a/Misc/ACKS b/Misc/ACKS
index ed5afe76cf49563c5bc321ab057f9b6f9d70940a..e2f990e68ba6ccf7b6db211471ced9e36b631fa4 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1218,6 +1218,7 @@ Eric V. Smith
 Gregory P. Smith
 Mark Smith
 Roy Smith
+Ryan Smith-Roberts
 Rafal Smotrzyk
 Eric Snow
 Dirk Soede

diff --git a/Misc/NEWS b/Misc/NEWS
index a6c5090cf7dd5ca0022da77b2064e3d51a89885f..6c8cacdea5754a7199fba4c6dea50b53dd6f731d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,8 @@ Library
 - Issue #20242: Fixed basicConfig() format strings for the alternative
   formatting styles. Thanks to kespindler for the bug report and patch.
 
+- Issue #20246: Fix buffer overflow in socket.recvfrom_into.
+
 - Issues #20206 and #5803: Fix edge case in email.quoprimime.encode where it
   truncated lines ending in a character needing encoding but no newline by
   using a more efficient algorithm that doesn't have the bug.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 6c229bcc10e42a8e13a8cb05e406c5e540198a9d..9cc317f5ef79e68a516658c9989d13af9c0d69cb 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2875,6 +2875,11 @@ sock_recvfrom_into(PySocketSockObject *s, PyObject *args, PyObject* kwds)
     if (recvlen == 0) {
         /* If nbytes was not specified, use the buffer's length */
         recvlen = buflen;
+    } else if (recvlen > buflen) {
+        PyBuffer_Release(&pbuf);
+        PyErr_SetString(PyExc_ValueError,
+                        "nbytes is greater than the length of the buffer");
+        return NULL;
     }
 
     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);