diff --git a/3-bugfix-for-CVE-2025-24201.patch b/3-bugfix-for-CVE-2025-24201.patch new file mode 100644 index 0000000000000000000000000000000000000000..64b676d01bcb9930098bf43baaaf7a9060469fa3 --- /dev/null +++ b/3-bugfix-for-CVE-2025-24201.patch @@ -0,0 +1,54 @@ +From 541280709a62351643fa7b456bc1f6d652fd9d0b Mon Sep 17 00:00:00 2001 +From: Kimmo Kinnunen +Date: Wed, 5 Mar 2025 16:49:53 -0800 +Subject: [PATCH] Cherry-pick b48791700366. rdar://146337054 + + WebGL context primitive restart can be toggled from WebContent process + https://bugs.webkit.org/show_bug.cgi?id=285858 + rdar://142693598 + + Reviewed by Cameron McCormack. + + Primitive restart is enabled for WebGL2 and disabled for WebGL 1 + contexts by default. There is no use-case for toggling it from + WCP. Do not pass enable/disable to ANGLE. + + * Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp: + (WebCore::GraphicsContextGLANGLE::disable): + (WebCore::GraphicsContextGLANGLE::enable): + + Canonical link: https://commits.webkit.org/289651.23@safari-7621-branch +--- + .../graphics/angle/GraphicsContextGLANGLE.cpp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp b/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp +index 39d148172b4f..81c9dff2fb89 100644 +--- a/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp ++++ b/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp +@@ -1169,7 +1169,11 @@ void GraphicsContextGLANGLE::disable(GCGLenum cap) + { + if (!makeContextCurrent()) + return; +- ++ if (cap == PRIMITIVE_RESTART_FIXED_INDEX) { ++ if (m_isForWebGL2) ++ addError(GCGLErrorCode::InvalidOperation); ++ return; ++ } + GL_Disable(cap); + } + +@@ -1203,7 +1207,11 @@ void GraphicsContextGLANGLE::enable(GCGLenum cap) + { + if (!makeContextCurrent()) + return; +- ++ if (cap == PRIMITIVE_RESTART_FIXED_INDEX) { ++ if (!m_isForWebGL2) ++ addError(GCGLErrorCode::InvalidOperation); ++ return; ++ } + GL_Enable(cap); + } + diff --git a/webkitgtk.spec b/webkitgtk.spec index f985be9247fbc2d870f5ca0cc3e1ac98165aebaa..0a1775493f00166ccbabd9725439038c4bd1a5c7 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their @@ -27,6 +27,7 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc Patch01: riscv-use-unknown-cpu.patch Patch02: fix_code_error.patch +Patch3: 3-bugfix-for-CVE-2025-24201.patch BuildRequires: bison @@ -456,6 +457,9 @@ export NINJA_STATUS="[2/2][%f/%t %es] " %endif %changelog +* Tue Jul 15 2025 tomcruiseqi - 2.48.1-4 +- Fix CVE-2025-24201 + * Tue Jun 24 2025 doupengda - 2.48.1-3 - add support for loongarch64