Security fix for CVE-2026-15308
Resolves: RHEL-193783
This commit is contained in:
parent
c4822c6e4e
commit
0ad244b12d
113
00490-cve-2026-15308.patch
Normal file
113
00490-cve-2026-15308.patch
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
From 0765ae4d3728db1e7d0870185d42e0025db6d2c5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Serhiy Storchaka <storchaka@gmail.com>
|
||||||
|
Date: Sat, 4 Jul 2026 20:40:22 +0300
|
||||||
|
Subject: [PATCH] gh-153030: Fix quadratic complexity in incremental parsing in
|
||||||
|
HTMLParser (GH-153031)
|
||||||
|
|
||||||
|
When an unterminated construct (e.g. a tag or comment) spanned many
|
||||||
|
feed() calls, rescanning the growing buffer and concatenating new data
|
||||||
|
onto it were both quadratic. New data is now accumulated in a list and
|
||||||
|
only joined and parsed once enough has piled up.
|
||||||
|
|
||||||
|
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
||||||
|
(cherry picked from commit bcf98ddbc40ec9b3ee87da0124a5660b19b7e606)
|
||||||
|
---
|
||||||
|
Lib/html/parser.py | 32 +++++++++++++++++--
|
||||||
|
Lib/test/test_htmlparser.py | 20 ++++++++++++
|
||||||
|
...-07-04-17-00-00.gh-issue-153030.RovkP6.rst | 3 ++
|
||||||
|
3 files changed, 53 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst
|
||||||
|
|
||||||
|
diff --git a/Lib/html/parser.py b/Lib/html/parser.py
|
||||||
|
index 62134d376e16549..a11e50982b92050 100644
|
||||||
|
--- a/Lib/html/parser.py
|
||||||
|
+++ b/Lib/html/parser.py
|
||||||
|
@@ -137,6 +137,9 @@ def reset(self):
|
||||||
|
self.cdata_elem = None
|
||||||
|
self._support_cdata = True
|
||||||
|
self._escapable = True
|
||||||
|
+ self._pending = []
|
||||||
|
+ self._pending_len = 0
|
||||||
|
+ self._parse_threshold = 1
|
||||||
|
_markupbase.ParserBase.reset(self)
|
||||||
|
|
||||||
|
def feed(self, data):
|
||||||
|
@@ -145,11 +148,36 @@ def feed(self, data):
|
||||||
|
Call this as often as you want, with as little or as much text
|
||||||
|
as you want (may include '\n').
|
||||||
|
"""
|
||||||
|
- self.rawdata = self.rawdata + data
|
||||||
|
- self.goahead(0)
|
||||||
|
+ # Accumulate new data in a list and only join and parse it once
|
||||||
|
+ # enough has piled up. Rescanning an unparsed buffer (e.g. an
|
||||||
|
+ # unterminated tag) and concatenating onto it on every call would
|
||||||
|
+ # both be quadratic in the input size.
|
||||||
|
+ self._pending_len += len(data)
|
||||||
|
+ if self._pending_len < self._parse_threshold:
|
||||||
|
+ self._pending.append(data)
|
||||||
|
+ else:
|
||||||
|
+ if not self._pending:
|
||||||
|
+ self.rawdata += data
|
||||||
|
+ else:
|
||||||
|
+ self._pending.append(data)
|
||||||
|
+ self.rawdata += ''.join(self._pending)
|
||||||
|
+ self._pending.clear()
|
||||||
|
+ self._pending_len = 0
|
||||||
|
+ n = len(self.rawdata)
|
||||||
|
+ self.goahead(0)
|
||||||
|
+ if len(self.rawdata) < n:
|
||||||
|
+ # Some data was parsed; resume on the next call.
|
||||||
|
+ self._parse_threshold = 1
|
||||||
|
+ else:
|
||||||
|
+ # Nothing was parsed; wait until the buffer doubles.
|
||||||
|
+ self._parse_threshold = len(self.rawdata)
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
"""Handle any buffered data."""
|
||||||
|
+ if self._pending:
|
||||||
|
+ self.rawdata += ''.join(self._pending)
|
||||||
|
+ self._pending.clear()
|
||||||
|
+ self._pending_len = 0
|
||||||
|
self.goahead(1)
|
||||||
|
|
||||||
|
__starttag_text = None
|
||||||
|
diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py
|
||||||
|
index 1c1be3ff476886c..c4b3da81bdfb7ee 100644
|
||||||
|
--- a/Lib/test/test_htmlparser.py
|
||||||
|
+++ b/Lib/test/test_htmlparser.py
|
||||||
|
@@ -929,6 +929,26 @@ def check(source):
|
||||||
|
check("<![CDATA[" * 9 * n)
|
||||||
|
check("<!doctype" * 35 * n)
|
||||||
|
|
||||||
|
+ @support.requires_resource('cpu')
|
||||||
|
+ def test_incremental_no_quadratic_complexity(self):
|
||||||
|
+ # An unterminated construct fed in many small chunks used to take
|
||||||
|
+ # quadratic time, both to rescan and to concatenate the buffer.
|
||||||
|
+ # Now it takes a fraction of a second.
|
||||||
|
+ def check(prefix, chunk, suffix):
|
||||||
|
+ parser = html.parser.HTMLParser()
|
||||||
|
+ parser.feed(prefix)
|
||||||
|
+ for _ in range(200_000):
|
||||||
|
+ parser.feed(chunk)
|
||||||
|
+ parser.feed(suffix)
|
||||||
|
+ parser.close()
|
||||||
|
+ chunk = "a" * 64
|
||||||
|
+ check("<!--", chunk, "-->") # comment
|
||||||
|
+ check("<?", chunk, ">") # processing instruction
|
||||||
|
+ check("<!doctype ", chunk, ">") # doctype
|
||||||
|
+ check("<![CDATA[", chunk, "]]>") # CDATA section
|
||||||
|
+ check("<a href='", chunk, "'>") # start tag
|
||||||
|
+ check("<script>", chunk, "</script>") # RAWTEXT element
|
||||||
|
+
|
||||||
|
|
||||||
|
class AttributesTestCase(TestCaseBase):
|
||||||
|
|
||||||
|
diff --git a/Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst b/Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000000..d1d60593f4ba7d2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+Fixed quadratic complexity in incremental parsing of long unterminated
|
||||||
|
+constructs (such as tags or comments) in :class:`html.parser.HTMLParser`,
|
||||||
|
+which could be exploited for a denial of service.
|
||||||
@ -17,7 +17,7 @@ URL: https://www.python.org/
|
|||||||
#global prerel ...
|
#global prerel ...
|
||||||
%global upstream_version %{general_version}%{?prerel}
|
%global upstream_version %{general_version}%{?prerel}
|
||||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
Version: %{general_version}%{?prerel:~%{prerel}}
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
|
|
||||||
|
|
||||||
@ -508,6 +508,17 @@ Patch482: 00482-cve-2026-6100.patch
|
|||||||
# (cherry-picked from commit acfe02f3b05436658d92add6b168538b30f357f0)
|
# (cherry-picked from commit acfe02f3b05436658d92add6b168538b30f357f0)
|
||||||
Patch489: 00489-openssl-3.5.7.patch
|
Patch489: 00489-openssl-3.5.7.patch
|
||||||
|
|
||||||
|
# 00490 #
|
||||||
|
# CVE-2026-15308
|
||||||
|
#
|
||||||
|
# gh-153030: Fix quadratic complexity in incremental parsing in HTMLParser (GH-153031) (GH-153038)
|
||||||
|
#
|
||||||
|
# When an unterminated construct (e.g. a tag or comment) spanned many
|
||||||
|
# feed() calls, rescanning the growing buffer and concatenating new data
|
||||||
|
# onto it were both quadratic. New data is now accumulated in a list and
|
||||||
|
# only joined and parsed once enough has piled up.
|
||||||
|
Patch490: 00490-cve-2026-15308.patch
|
||||||
|
|
||||||
# (New patches go here ^^^)
|
# (New patches go here ^^^)
|
||||||
#
|
#
|
||||||
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
||||||
@ -1919,6 +1930,10 @@ CheckPython optimized
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 13 2026 Lukáš Zachar <lzachar@redhat.com> - 3.9.25-9
|
||||||
|
- Security fix for CVE-2026-15308
|
||||||
|
Resolves: RHEL-193783
|
||||||
|
|
||||||
* Thu Jul 02 2026 Miro Hrončok <mhroncok@redhat.com> - 3.9.25-8
|
* Thu Jul 02 2026 Miro Hrončok <mhroncok@redhat.com> - 3.9.25-8
|
||||||
- Fix ssl.SSLError: [ASN1: NOT_ENOUGH_DATA] not enough data with OpenSSL 3.5.7+
|
- Fix ssl.SSLError: [ASN1: NOT_ENOUGH_DATA] not enough data with OpenSSL 3.5.7+
|
||||||
Resolves: RHEL-191730
|
Resolves: RHEL-191730
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user