[packages/python] fix buffer overflow in socket.recvfrom_into
jajcus
jajcus at pld-linux.org
Fri Feb 21 10:40:39 CET 2014
commit 85879b0a20d361742c60fe028af4b8b41494b797
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Feb 21 10:39:54 2014 +0100
fix buffer overflow in socket.recvfrom_into
http://bugs.python.org/issue20246
Release: 2
python-buffer-overflow.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
python.spec | 4 +++-
2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/python.spec b/python.spec
index 6795902..8e3d7d7 100644
--- a/python.spec
+++ b/python.spec
@@ -43,7 +43,7 @@ Summary(tr.UTF-8): X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом
Name: python
Version: %{py_ver}.6
-Release: 1
+Release: 2
Epoch: 1
License: PSF
Group: Development/Languages/Python
@@ -60,6 +60,7 @@ Patch5: %{name}-verbose.patch
Patch6: %{name}-distro.patch
Patch7: %{name}-DNStests.patch
Patch8: %{name}-ENOPROTOOPT-test.patch
+Patch9: %{name}-buffer-overflow.patch
URL: http://www.python.org/
BuildRequires: autoconf >= 2.65
BuildRequires: automake
@@ -561,6 +562,7 @@ Przykłady te są dla Pythona 2.3.4, nie %{version}.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
tar xjf %{SOURCE1}
diff --git a/python-buffer-overflow.patch b/python-buffer-overflow.patch
new file mode 100644
index 0000000..164b462
--- /dev/null
+++ b/python-buffer-overflow.patch
@@ -0,0 +1,43 @@
+
+# HG changeset patch
+# User Benjamin Peterson <benjamin at python.org>
+# Date 1389671978 18000
+# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9
+# Parent 2631d33ee7fbd5f0288931ef37872218d511d2e8
+complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
+
+diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
+--- a/Lib/test/test_socket.py
++++ b/Lib/test/test_socket.py
+@@ -1620,6 +1620,16 @@ 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):
++ with test_support.check_py3k_warnings():
++ buf = buffer(MSG*2048)
++ self.serv_conn.send(buf)
++
+
+ TIPC_STYPE = 2000
+ TIPC_LOWER = 200
+diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s
+ if (recvlen == 0) {
+ /* If nbytes was not specified, use the buffer's length */
+ recvlen = buflen;
++ } else if (recvlen > buflen) {
++ PyErr_SetString(PyExc_ValueError,
++ "nbytes is greater than the length of the buffer");
++ goto error;
+ }
+
+ readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/85879b0a20d361742c60fe028af4b8b41494b797
More information about the pld-cvs-commit
mailing list