merge r68768 to py3k

jnoller · jnoller · commit 6214edd1bbf8 · 2009-01-19T16:23:53.000Z
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
@@ -62,6 +62,8 @@ def latin(s):
 HAVE_GETVALUE = not getattr(_multiprocessing,
                             'HAVE_BROKEN_SEM_GETVALUE', False)
 
+WIN32 = (sys.platform == "win32")
+
 #
 # Creates a wrapper for a function which records the time it takes to finish
 #
@@ -1683,6 +1685,18 @@ def test_level(self):
         logger.setLevel(level=LOG_LEVEL)
 
 #
+# Test to verify handle verification, see issue 3321
+#
+
+class TestInvalidHandle(unittest.TestCase):
+
+    def test_invalid_handles(self):
+        if WIN32:
+            return
+        conn = _multiprocessing.Connection(44977608)
+        self.assertRaises(IOError, conn.poll)
+        self.assertRaises(IOError, _multiprocessing.Connection, -1)
+#
 # Functions used to create test cases from the base ones in this module
 #
 
@@ -1786,7 +1800,7 @@ def send_bytes(self, data):
                           multiprocessing.connection.answer_challenge,
                           _FakeConnection(), b'abc')
 
-testcases_other = [OtherTest]
+testcases_other = [OtherTest, TestInvalidHandle]
 
 #
 #
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -143,6 +143,10 @@ Library
 - Issue #4959: inspect.formatargspec now works for keyword only arguments
   without defaults.
 
+- Issue #3321: _multiprocessing.Connection() doesn't check handle; added checks
+  for *nix machines for negative handles and large int handles. Without this check
+  it is possible to segfault the interpreter.
+
 - Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue
   in sharedctypes.py.
 
diff --git a/Modules/_multiprocessing/connection.h b/Modules/_multiprocessing/connection.h
@@ -362,7 +362,7 @@ connection_poll(ConnectionObject *self, PyObject *args)
 	}
 
 	Py_BEGIN_ALLOW_THREADS
-	res = conn_poll(self, timeout);
+	res = conn_poll(self, timeout, _save);
 	Py_END_ALLOW_THREADS
 
 	switch (res) {
diff --git a/Modules/_multiprocessing/socket_connection.c b/Modules/_multiprocessing/socket_connection.c
@@ -153,11 +153,23 @@ conn_recv_string(ConnectionObject *conn, char *buffer,
  */
 
 static int
-conn_poll(ConnectionObject *conn, double timeout)
+conn_poll(ConnectionObject *conn, double timeout, PyThreadState *_save)
 {
 	int res;
 	fd_set rfds;
 
+	/*
+	 * Verify the handle, issue 3321. Not required for windows.
+	 */ 
+	#ifndef MS_WINDOWS
+		if (((int)conn->handle) < 0 || ((int)conn->handle) >= FD_SETSIZE) {
+			Py_BLOCK_THREADS
+			PyErr_SetString(PyExc_IOError, "handle out of range in select()");
+			Py_UNBLOCK_THREADS
+			return MP_EXCEPTION_HAS_BEEN_SET;
+		}
+	#endif
+
 	FD_ZERO(&rfds);
 	FD_SET((SOCKET)conn->handle, &rfds);
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ def latin(s):`
`62`	`62`	`HAVE_GETVALUE = not getattr(_multiprocessing,`
`63`	`63`	`'HAVE_BROKEN_SEM_GETVALUE', False)`
`64`	`64`
	`65`	`+WIN32 = (sys.platform == "win32")`
	`66`	`+`
`65`	`67`	`#`
`66`	`68`	`# Creates a wrapper for a function which records the time it takes to finish`
`67`	`69`	`#`
`@@ -1683,6 +1685,18 @@ def test_level(self):`
`1683`	`1685`	`logger.setLevel(level=LOG_LEVEL)`
`1684`	`1686`
`1685`	`1687`	`#`
	`1688`	`+# Test to verify handle verification, see issue 3321`
	`1689`	`+#`
	`1690`	`+`
	`1691`	`+class TestInvalidHandle(unittest.TestCase):`
	`1692`	`+`
	`1693`	`+ def test_invalid_handles(self):`
	`1694`	`+ if WIN32:`
	`1695`	`+ return`
	`1696`	`+ conn = _multiprocessing.Connection(44977608)`
	`1697`	`+ self.assertRaises(IOError, conn.poll)`
	`1698`	`+ self.assertRaises(IOError, _multiprocessing.Connection, -1)`
	`1699`	`+#`
`1686`	`1700`	`# Functions used to create test cases from the base ones in this module`
`1687`	`1701`	`#`
`1688`	`1702`
`@@ -1786,7 +1800,7 @@ def send_bytes(self, data):`
`1786`	`1800`	`multiprocessing.connection.answer_challenge,`
`1787`	`1801`	`_FakeConnection(), b'abc')`
`1788`	`1802`
`1789`		`-testcases_other = [OtherTest]`
	`1803`	`+testcases_other = [OtherTest, TestInvalidHandle]`
`1790`	`1804`
`1791`	`1805`	`#`
`1792`	`1806`	`#`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ connection_poll(ConnectionObject self, PyObject args)`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`Py_BEGIN_ALLOW_THREADS`
`365`		`- res = conn_poll(self, timeout);`
	`365`	`+ res = conn_poll(self, timeout, _save);`
`366`	`366`	`Py_END_ALLOW_THREADS`
`367`	`367`
`368`	`368`	`switch (res) {`