diff --git a/CVE-2024-31047.patch b/CVE-2024-31047.patch new file mode 100644 index 0000000000000000000000000000000000000000..66b040edf06e0ce80800d3525510cf5b31618d39 --- /dev/null +++ b/CVE-2024-31047.patch @@ -0,0 +1,42 @@ +From 7aa89e1d09b09d9f5dbb96976ee083a331ab9d71 Mon Sep 17 00:00:00 2001 +From: xiaoxiaoafeifei +Date: Wed, 20 Mar 2024 00:09:05 +0800 +Subject: [PATCH] prevent integer overflows in file exrmultipart.cpp (#1681) + +Signed-off-by: ZhaiLiangliang + +Origin: https://github.com/AcademySoftwareFoundation/openexr/pull/1681 + +--- + src/bin/exrmultipart/exrmultipart.cpp | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/bin/exrmultipart/exrmultipart.cpp b/src/bin/exrmultipart/exrmultipart.cpp +index 931cebc..1c624b8 100644 +--- a/src/bin/exrmultipart/exrmultipart.cpp ++++ b/src/bin/exrmultipart/exrmultipart.cpp +@@ -326,12 +326,17 @@ convert(vector in, + } + + Box2i dataWindow = infile.header(0).dataWindow(); +- int pixel_count = (dataWindow.size().y+1)*(dataWindow.size().x+1); +- int pixel_width = dataWindow.size().x+1; +- ++ // ++ // use int64_t for dimensions, since possible overflow int storage ++ // ++ int64_t pixel_count = (static_cast(dataWindow.size ().y) + 1) * (static_cast(dataWindow.size ().x) + 1); ++ int64_t pixel_width = static_cast(dataWindow.size ().x) + 1; + ++ // + // offset in pixels between base of array and 0,0 +- int pixel_base = dataWindow.min.y*pixel_width+dataWindow.min.x; ++ // use int64_t for dimensions, since dataWindow.min.y * pixel_width could overflow int storage ++ // ++ int64_t pixel_base = static_cast(dataWindow.min.y) * pixel_width + static_cast(dataWindow.min.x); + + vector< vector > channelstore(channel_count); + +-- +2.43.0 + diff --git a/OpenEXR.spec b/OpenEXR.spec index d51e7930102c111fcdc28c4c5634fa0be822b0ae..ccb312d517ff4ca36f456ee84f7d2afa581e6042 100644 --- a/OpenEXR.spec +++ b/OpenEXR.spec @@ -1,12 +1,13 @@ Name: OpenEXR Summary: A high dynamic-range (HDR) image file format for use in computer imaging applications Version: 3.1.5 -Release: 2 +Release: 3 License: BSD URL: http://www.openexr.com/ Source0: https://github.com/AcademySoftwareFoundation/openexr/archive/v%{version}/openexr-%{version}.tar.gz # https://github.com/AcademySoftwareFoundation/openexr/commit/df4d77471f2722025011da2e699d581d1e757f6b Patch0: CVE-2023-5841.patch +Patch1: CVE-2024-31047.patch BuildRequires: gcc-c++ zlib-devel pkgconfig python3-devel BuildRequires: cmake gcc boost-devel pkgconfig(Imath) @@ -70,6 +71,9 @@ This package contains libraries and header files for development of %{name}. %{_libdir}/pkgconfig/OpenEXR.pc %changelog +* Wed Apr 17 2024 wangkai <13474090681@163.com> - 3.1.5-3 +- Fix CVE-2024-31047 + * Mon Feb 26 2024 yaoxin - 3.1.5-2 - Fix CVE-2023-5841