From 63db1258d453e95bb9fcaf3c7e8dde7eb25fa36b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 30 Jul 2025 21:52:45 +0200 Subject: [PATCH] Backport fix for CVE-2025-53644 --- a39db41390de546d18962ee1278bd6dbb715f466.patch | 12 ++++++++++++ mingw-opencv.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 a39db41390de546d18962ee1278bd6dbb715f466.patch diff --git a/a39db41390de546d18962ee1278bd6dbb715f466.patch b/a39db41390de546d18962ee1278bd6dbb715f466.patch new file mode 100644 index 0000000..a1e79d2 --- /dev/null +++ b/a39db41390de546d18962ee1278bd6dbb715f466.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference opencv-4.10.0/3rdparty/openjpeg/openjp2/jp2.c opencv-4.10.0-new/3rdparty/openjpeg/openjp2/jp2.c +--- opencv-4.10.0/3rdparty/openjpeg/openjp2/jp2.c 2024-06-02 13:41:07.000000000 +0200 ++++ opencv-4.10.0-new/3rdparty/openjpeg/openjp2/jp2.c 2025-07-30 21:57:50.267496180 +0200 +@@ -2869,7 +2869,7 @@ OPJ_BOOL opj_jp2_read_header(opj_stream_ + p_image, + p_manager); + +- if (p_image && *p_image) { ++ if (ret && p_image && *p_image) { + /* Set Image Color Space */ + if (jp2->enumcs == 16) { + (*p_image)->color_space = OPJ_CLRSPC_SRGB; diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 53d338f..1a39022 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.10.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -23,6 +23,8 @@ Source2: %{pkgname}-clean.sh Patch0: opencv_unbundle.patch # Pass -mbig-obj to linker when linking python module, to prevent "too many sections" failure Patch1: opencv_bigobj.patch +# Backport fix for CVE-2025-53644 +Patch2: https://github.com/opencv/opencv/commit/a39db41390de546d18962ee1278bd6dbb715f466.patch BuildRequires: make @@ -236,6 +238,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Wed Jul 30 2025 Sandro Mani - 4.10.0-6 +- Backport fix for CVE-2025-53644 + * Fri Jan 17 2025 Fedora Release Engineering - 4.10.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild