forked from pool/python312
- Add CVE-2024-12254-unbound-mem-buffering-SelectorSocketTransport.writelines.patch
preventing exhaustion of memory (gh#python/cpython#127655, bsc#1234290, CVE-2024-12254). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python312?expand=0&rev=88
This commit is contained in:
@@ -0,0 +1,46 @@
|
|||||||
|
From bfc2e93d755bf496e5ef4cae9609d2823122c909 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "J. Nick Koston" <nick@koston.org>
|
||||||
|
Date: Thu, 5 Dec 2024 10:01:10 -0600
|
||||||
|
Subject: [PATCH 01/10] Ensure writelines pauses the protocol if needed
|
||||||
|
|
||||||
|
---
|
||||||
|
Lib/asyncio/selector_events.py | 1
|
||||||
|
Lib/test/test_asyncio/test_selector_events.py | 12 ++++++++++
|
||||||
|
Misc/NEWS.d/next/Security/2024-12-05-21-35-19.gh-issue-127655.xpPoOf.rst | 1
|
||||||
|
3 files changed, 14 insertions(+)
|
||||||
|
|
||||||
|
--- a/Lib/asyncio/selector_events.py
|
||||||
|
+++ b/Lib/asyncio/selector_events.py
|
||||||
|
@@ -1183,6 +1183,7 @@ class _SelectorSocketTransport(_Selector
|
||||||
|
# If the entire buffer couldn't be written, register a write handler
|
||||||
|
if self._buffer:
|
||||||
|
self._loop._add_writer(self._sock_fd, self._write_ready)
|
||||||
|
+ self._maybe_pause_protocol()
|
||||||
|
|
||||||
|
def can_write_eof(self):
|
||||||
|
return True
|
||||||
|
--- a/Lib/test/test_asyncio/test_selector_events.py
|
||||||
|
+++ b/Lib/test/test_asyncio/test_selector_events.py
|
||||||
|
@@ -805,6 +805,18 @@ class SelectorSocketTransportTests(test_
|
||||||
|
self.assertTrue(self.sock.send.called)
|
||||||
|
self.assertTrue(self.loop.writers)
|
||||||
|
|
||||||
|
+ def test_writelines_pauses_protocol(self):
|
||||||
|
+ data = memoryview(b'data')
|
||||||
|
+ self.sock.send.return_value = 2
|
||||||
|
+ self.sock.send.fileno.return_value = 7
|
||||||
|
+
|
||||||
|
+ transport = self.socket_transport()
|
||||||
|
+ transport._high_water = 1
|
||||||
|
+ transport.writelines([data])
|
||||||
|
+ self.assertTrue(self.protocol.pause_writing.called)
|
||||||
|
+ self.assertTrue(self.sock.send.called)
|
||||||
|
+ self.assertTrue(self.loop.writers)
|
||||||
|
+
|
||||||
|
@unittest.skipUnless(selector_events._HAS_SENDMSG, 'no sendmsg')
|
||||||
|
def test_write_sendmsg_full(self):
|
||||||
|
data = memoryview(b'data')
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Security/2024-12-05-21-35-19.gh-issue-127655.xpPoOf.rst
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+Fixed the :class:`!asyncio.selector_events._SelectorSocketTransport` transport not pausing writes for the protocol when the buffer reaches the high water mark when using :meth:`asyncio.WriteTransport.writelines`.
|
||||||
@@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 6 20:39:56 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
- Add CVE-2024-12254-unbound-mem-buffering-SelectorSocketTransport.writelines.patch
|
||||||
|
preventing exhaustion of memory (gh#python/cpython#127655,
|
||||||
|
bsc#1234290, CVE-2024-12254).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 4 21:47:08 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
Wed Dec 4 21:47:08 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
|||||||
@@ -182,6 +182,9 @@ Patch41: docs-docutils_014-Sphinx_420.patch
|
|||||||
# PATCH-FIX-SLE doc-py38-to-py36.patch mcepl@suse.com
|
# PATCH-FIX-SLE doc-py38-to-py36.patch mcepl@suse.com
|
||||||
# Make documentation extensions working with Python 3.6
|
# Make documentation extensions working with Python 3.6
|
||||||
Patch44: doc-py38-to-py36.patch
|
Patch44: doc-py38-to-py36.patch
|
||||||
|
# PATCH-FIX-UPSTREAM CVE-2024-12254-unbound-mem-buffering-SelectorSocketTransport.writelines.patch bsc#1234290 mcepl@suse.com
|
||||||
|
# x
|
||||||
|
Patch45: CVE-2024-12254-unbound-mem-buffering-SelectorSocketTransport.writelines.patch
|
||||||
BuildRequires: autoconf-archive
|
BuildRequires: autoconf-archive
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@@ -438,8 +441,7 @@ This package contains libpython3.2 shared library for embedding in
|
|||||||
other applications.
|
other applications.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{tarname}
|
%autosetup -p1 -n %{tarname}
|
||||||
%autopatch -p1
|
|
||||||
|
|
||||||
# Fix devhelp doc build gh#python/cpython#120150
|
# Fix devhelp doc build gh#python/cpython#120150
|
||||||
echo "master_doc = 'contents'" >> Doc/conf.py
|
echo "master_doc = 'contents'" >> Doc/conf.py
|
||||||
|
|||||||
Reference in New Issue
Block a user