pool/python
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=162

Browse Source
This commit is contained in:
Jan Matejek 2014-02-13 17:06:03 +00:00 committed by Git OBS Bridge
parent 11f0210274
commit fa1bcb4632
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CVE-2014-1912-recvfrom_into.patch
View File

@ -6,10 +6,11 @@
# 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):
Index: Python-2.7.6/Lib/test/test_socket.py
===================================================================
--- Python-2.7.6.orig/Lib/test/test_socket.py 2013-11-10 08:36:40.000000000 +0100
+++ Python-2.7.6/Lib/test/test_socket.py 2014-02-13 18:04:12.710244327 +0100
@@ -1616,6 +1616,16 @@
_testRecvFromIntoMemoryview = _testRecvFromIntoArray
@ -26,10 +27,11 @@ diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
TIPC_STYPE = 2000
TIPC_LOWER = 200
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -979,6 +979,7 @@ Eric V. Smith
Index: Python-2.7.6/Misc/ACKS
===================================================================
--- Python-2.7.6.orig/Misc/ACKS 2013-11-10 08:36:41.000000000 +0100
+++ Python-2.7.6/Misc/ACKS 2014-02-13 18:04:12.710244327 +0100
@@ -973,6 +973,7 @@
Christopher Smith
Gregory P. Smith
Roy Smith
@ -37,10 +39,11 @@ diff --git a/Misc/ACKS b/Misc/ACKS
Rafal Smotrzyk
Dirk Soede
Paul Sokolovsky
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
Index: Python-2.7.6/Modules/socketmodule.c
===================================================================
--- Python-2.7.6.orig/Modules/socketmodule.c 2013-11-10 08:36:41.000000000 +0100
+++ Python-2.7.6/Modules/socketmodule.c 2014-02-13 18:04:12.711244332 +0100
@@ -2742,6 +2742,10 @@
if (recvlen == 0) {
/* If nbytes was not specified, use the buffer's length */
recvlen = buflen;
@ -51,4 +54,3 @@ diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
}
readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);