diff options
| author | Kubilay Kocak <koobs@FreeBSD.org> | 2014-03-01 10:52:55 +0000 |
|---|---|---|
| committer | Kubilay Kocak <koobs@FreeBSD.org> | 2014-03-01 10:52:55 +0000 |
| commit | 7a2c2ce6e780ec6a01f1de55c980810b9175edce (patch) | |
| tree | 248c85db7a6c42f16f546a42fbbe907b01ec6c8f /lang/python33 | |
| parent | security/vuxml: Document CVE-2014-1912 for Python 2.7 - 3.3 (diff) | |
lang/python*: Backport security fix for CVE-2014-1912
A vulnerability was reported [1] in Python's socket module, due to a
boundary error within the sock_recvfrom_into() function, which could be
exploited to cause a buffer overflow.
This could be used to crash a Python application that uses the
socket.recvfrom_info() function or, possibly, execute arbitrary code
with the permissions of the user running vulnerable Python code.
This vulnerable function, socket.recvfrom_into(), was introduced in
Python 2.5. Earlier versions are not affected by this flaw. This is
fixed in upstream branches for version 2.7, 3.1, 3.2 and 3.3.
[1] http://bugs.python.org/issue20246
MFH: 2014Q1
Security: 8e5e6d42-a0fa-11e3-b09a-080027f2d077
Notes
Notes:
svn path=/head/; revision=346614
Diffstat (limited to 'lang/python33')
| -rw-r--r-- | lang/python33/Makefile | 2 | ||||
| -rw-r--r-- | lang/python33/files/patch-CVE-2014-1912 | 49 |
2 files changed, 50 insertions, 1 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile index 067cc293bc46..10036bd57530 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= 3.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python33/files/patch-CVE-2014-1912 b/lang/python33/files/patch-CVE-2014-1912 new file mode 100644 index 000000000000..027d52350e0d --- /dev/null +++ b/lang/python33/files/patch-CVE-2014-1912 @@ -0,0 +1,49 @@ +# HG changeset patch +# User Benjamin Peterson <benjamin@python.org> +# Date 1389672775 18000 +# Node ID 7f176a45211ff3cb85a2fbdc75f7979d642bb563 +# Parent ed1c27b68068c942c6e845bdf8e987e963d50920# Parent 9c56217e5c793685eeaf0ee224848c402bdf1e4c +merge 3.2 (#20246) + +# HG changeset patch +# User Stefan Krah <skrah@bytereef.org> +# Date 1390341520 -3600 +# Node ID 5c4f4db8107cc7b99e0a4e9c7b760c816dafa034 +# Parent 2fe0b2dcc98cd9013642fb9642365de80ff0dc30 +Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts. + +diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -4538,6 +4538,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) ++ + + TIPC_STYPE = 2000 + TIPC_LOWER = 200 + +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +--- Modules/socketmodule.c ++++ Modules/socketmodule.c +@@ -2935,6 +2935,11 @@ sock_recvfrom_into(PySocketSockObject *s + 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); + |