From 1842b4af4bea5074275a9015816a83360a933ef9 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Thu, 13 Jan 2022 14:58:37 +0800 Subject: [PATCH] Fix CVE-2021-45930 --- CVE-2021-45930.patch | 221 +++++++++++++++++++++++++++++++++++++++++++ qt5-qtsvg.spec | 6 +- 2 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 CVE-2021-45930.patch diff --git a/CVE-2021-45930.patch b/CVE-2021-45930.patch new file mode 100644 index 0000000..c1d1534 --- /dev/null +++ b/CVE-2021-45930.patch @@ -0,0 +1,221 @@ +From 36cfd9efb9b22b891adee9c48d30202289cfa620 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Mon, 25 Oct 2021 14:17:55 +0200 +Subject: [PATCH] Do stricter error checking when parsing path nodes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The SVG spec mandates that path parsing should terminate on the first +error encountered, and an error be reported. To improve the handling +of corrupt files, implement such error handling, and also limit the +number of QPainterPath elements to a reasonable range. + +Fixes: QTBUG-96044 +Pick-to: 6.2 5.15 5.12 +Change-Id: Ic5e65d6b658516d6f1317c72de365c8c7ad81891 +Reviewed-by: Allan Sandfeld Jensen +Reviewed-by: Robert Löhning +--- + src/svg/qsvghandler.cpp | 59 +++++++++++++++++------------------------ + 1 file changed, 25 insertions(+), 34 deletions(-) + +diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp +index db29211..dd869ff 100644 +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -1615,6 +1615,7 @@ static void pathArc(QPainterPath &path, + + static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path) + { ++ const int maxElementCount = 0x7fff; // Assume file corruption if more path elements than this + qreal x0 = 0, y0 = 0; // starting point + qreal x = 0, y = 0; // current point + char lastMode = 0; +@@ -1622,7 +1623,8 @@ static bool parsePathDataFast(const QStr + const QChar *str = dataStr.constData(); + const QChar *end = str + dataStr.size(); + +- while (str != end) { ++ bool ok = true; ++ while (ok && str != end) { + while (str->isSpace() && (str + 1) != end) + ++str; + QChar pathElem = *str; +@@ -1636,14 +1638,13 @@ static bool parsePathDataFast(const QStr + arg.append(0);//dummy + const qreal *num = arg.constData(); + int count = arg.count(); +- while (count > 0) { ++ while (ok && count > 0) { + qreal offsetX = x; // correction offsets + qreal offsetY = y; // for relative commands + switch (pathElem.unicode()) { + case 'm': { + if (count < 2) { +- num++; +- count--; ++ ok = false; + break; + } + x = x0 = num[0] + offsetX; +@@ -1660,8 +1661,7 @@ static bool parsePathDataFast(const QStr + break; + case 'M': { + if (count < 2) { +- num++; +- count--; ++ ok = false; + break; + } + x = x0 = num[0]; +@@ -1687,8 +1687,7 @@ static bool parsePathDataFast(const QStr + break; + case 'l': { + if (count < 2) { +- num++; +- count--; ++ ok = false; + break; + } + x = num[0] + offsetX; +@@ -1701,8 +1700,7 @@ static bool parsePathDataFast(const QStr + break; + case 'L': { + if (count < 2) { +- num++; +- count--; ++ ok = false; + break; + } + x = num[0]; +@@ -1742,8 +1740,7 @@ static bool parsePathDataFast(const QStr + break; + case 'c': { + if (count < 6) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF c1(num[0] + offsetX, num[1] + offsetY); +@@ -1759,8 +1756,7 @@ static bool parsePathDataFast(const QStr + } + case 'C': { + if (count < 6) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF c1(num[0], num[1]); +@@ -1776,8 +1772,7 @@ static bool parsePathDataFast(const QStr + } + case 's': { + if (count < 4) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF c1; +@@ -1798,8 +1793,7 @@ static bool parsePathDataFast(const QStr + } + case 'S': { + if (count < 4) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF c1; +@@ -1820,8 +1814,7 @@ static bool parsePathDataFast(const QStr + } + case 'q': { + if (count < 4) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF c(num[0] + offsetX, num[1] + offsetY); +@@ -1836,8 +1829,7 @@ static bool parsePathDataFast(const QStr + } + case 'Q': { + if (count < 4) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF c(num[0], num[1]); +@@ -1852,8 +1844,7 @@ static bool parsePathDataFast(const QStr + } + case 't': { + if (count < 2) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF e(num[0] + offsetX, num[1] + offsetY); +@@ -1873,8 +1864,7 @@ static bool parsePathDataFast(const QStr + } + case 'T': { + if (count < 2) { +- num += count; +- count = 0; ++ ok = false; + break; + } + QPointF e(num[0], num[1]); +@@ -1894,8 +1884,7 @@ static bool parsePathDataFast(const QStr + } + case 'a': { + if (count < 7) { +- num += count; +- count = 0; ++ ok = false; + break; + } + qreal rx = (*num++); +@@ -1917,8 +1906,7 @@ static bool parsePathDataFast(const QStr + break; + case 'A': { + if (count < 7) { +- num += count; +- count = 0; ++ ok = false; + break; + } + qreal rx = (*num++); +@@ -1939,12 +1927,15 @@ static bool parsePathDataFast(const QStr + } + break; + default: +- return false; ++ ok = false; ++ break; + } + lastMode = pathElem.toLatin1(); ++ if (path.elementCount() > maxElementCount) ++ ok = false; + } + } +- return true; ++ return ok; + } + + static bool parseStyle(QSvgNode *node, +@@ -2980,8 +2971,8 @@ static QSvgNode *createPathNode(QSvgNode + + QPainterPath qpath; + qpath.setFillRule(Qt::WindingFill); +- //XXX do error handling +- parsePathDataFast(data, qpath); ++ if (!parsePathDataFast(data, qpath)) ++ qCWarning(lcSvgHandler, "Invalid path data; path truncated."); + + QSvgNode *path = new QSvgPath(parent, qpath); + return path; + diff --git a/qt5-qtsvg.spec b/qt5-qtsvg.spec index bbae939..3869547 100644 --- a/qt5-qtsvg.spec +++ b/qt5-qtsvg.spec @@ -1,12 +1,13 @@ Name: qt5-qtsvg Version: 5.15.2 -Release: 1 +Release: 2 Summary: Qt GUI toolkit for rendering and displaying SVG License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtsvg-everywhere-src-%{version}.tar.xz Patch0: qtsvg-5.15.2-clamp-parsed-doubles-to-float-representtable-values.patch +Patch1: CVE-2021-45930.patch BuildRequires: make BuildRequires: qt5-qtbase-devel >= %{version} pkgconfig(zlib) qt5-qtbase-private-devel @@ -64,6 +65,9 @@ popd %{_qt5_archdatadir}/mkspecs/modules/qt_lib_svg*.pri %changelog +* Thu Jan 13 2022 wangkai - 5.15.2-2 +- Fix CVE-2021-45930 + * Wed Dec 29 2021 peijiankang - 5.15.2-1 - update to upstream version 5.15.2 -- Gitee