commit: 88f1f90c6eae0dfe709f212a33cb06fea6d3898c Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Jul 11 13:52:15 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Jul 11 14:06:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f1f90c
dev-qt/qtbase: backport fix for CVE-2025-5992 Bug: https://bugs.gentoo.org/959851 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../qtbase/files/qtbase-6.9.1-CVE-2025-5992.patch | 25 ++++++++++++++++++++++ ...base-6.9.1-r1.ebuild => qtbase-6.9.1-r2.ebuild} | 1 + 2 files changed, 26 insertions(+) diff --git a/dev-qt/qtbase/files/qtbase-6.9.1-CVE-2025-5992.patch b/dev-qt/qtbase/files/qtbase-6.9.1-CVE-2025-5992.patch new file mode 100644 index 000000000000..b7ec70b657b2 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.9.1-CVE-2025-5992.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/959851 +https://www.qt.io/blog/security-advisory-recently-reported-denial-of-service-issue-in-qcolortransfergenericfunction-impacts-qt +https://codereview.qt-project.org/c/qt/qtbase/+/657023 +--- a/src/gui/painting/qcolortransfergeneric_p.h ++++ b/src/gui/painting/qcolortransfergeneric_p.h +@@ -19,2 +19,3 @@ + ++#include <algorithm> + #include <cmath> +@@ -67,2 +68,3 @@ + { ++ x = std::clamp(x, 0.f, 12.f); + if (x > 1.f) +@@ -75,2 +77,3 @@ + { ++ x = std::clamp(x, 0.f, 1.f); + if (x < 0.5f) +@@ -88,2 +91,3 @@ + { ++ e = std::clamp(e, 0.f, 1.f); + // m2-th root of E' +@@ -101,2 +105,3 @@ + { ++ fd = std::clamp(fd, 0.f, 64.f); + // scale Fd to Y diff --git a/dev-qt/qtbase/qtbase-6.9.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.9.1-r2.ebuild similarity index 99% rename from dev-qt/qtbase/qtbase-6.9.1-r1.ebuild rename to dev-qt/qtbase/qtbase-6.9.1-r2.ebuild index a79014dcb62f..75c3de3b48a3 100644 --- a/dev-qt/qtbase/qtbase-6.9.1-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.9.1-r2.ebuild @@ -181,6 +181,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.8.2-cross.patch "${FILESDIR}"/${PN}-6.9.0-no-direct-extern-access.patch "${FILESDIR}"/${PN}-6.9.1-QTBUG-137755.patch + "${FILESDIR}"/${PN}-6.9.1-CVE-2025-5992.patch ) src_prepare() {
