Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d68a0128f | ||
|
|
a3f88b6ca6 | ||
|
|
ce33b177a1 |
2 changed files with 28 additions and 7 deletions
23
vtk-CVE-2025-34297.patch
Normal file
23
vtk-CVE-2025-34297.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
diff -up VTK-9.6.0/ThirdParty/kissfft/vtkkissfft/kiss_fft.c.CVE-2025-34297 VTK-9.6.0/ThirdParty/kissfft/vtkkissfft/kiss_fft.c
|
||||||
|
--- VTK-9.6.0/ThirdParty/kissfft/vtkkissfft/kiss_fft.c.CVE-2025-34297 2026-02-10 20:19:44.000000000 -0700
|
||||||
|
+++ VTK-9.6.0/ThirdParty/kissfft/vtkkissfft/kiss_fft.c 2026-03-16 19:49:43.257246266 -0600
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
* See COPYING file for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-
|
||||||
|
+#include <stdint.h>
|
||||||
|
#include "_kiss_fft_guts.h"
|
||||||
|
/* The guts header contains all the multiplication and addition macros that are defined for
|
||||||
|
fixed or floating point complex numbers. It also delares the kf_ internal functions.
|
||||||
|
@@ -333,6 +333,10 @@ void kf_factor(int n,int * facbuf)
|
||||||
|
kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem )
|
||||||
|
{
|
||||||
|
kiss_fft_cfg st=NULL;
|
||||||
|
+ // check for overflow condition {memneeded > SIZE_MAX}.
|
||||||
|
+ if (nfft >= (SIZE_MAX - 2*sizeof(struct kiss_fft_state))/sizeof(kiss_fft_cpx))
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
size_t memneeded = sizeof(struct kiss_fft_state)
|
||||||
|
+ sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/
|
||||||
|
|
||||||
12
vtk.spec
12
vtk.spec
|
|
@ -1,5 +1,3 @@
|
||||||
%undefine __cmake_in_source_build
|
|
||||||
|
|
||||||
# State Nov 11 2020, LTO causes
|
# State Nov 11 2020, LTO causes
|
||||||
# TestXMLHyperTreeGridIO.cxx.o (symbol from plugin): undefined reference to symbol
|
# TestXMLHyperTreeGridIO.cxx.o (symbol from plugin): undefined reference to symbol
|
||||||
# '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11'
|
# '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11'
|
||||||
|
|
@ -80,13 +78,15 @@ Patch: vtk-tk9.patch
|
||||||
# https://gitlab.kitware.com/vtk/vtk/-/issues/19622
|
# https://gitlab.kitware.com/vtk/vtk/-/issues/19622
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2386242
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2386242
|
||||||
Patch: vtk-ppc64-no-always-inline.patch
|
Patch: vtk-ppc64-no-always-inline.patch
|
||||||
|
# Fix Integer Overflow on 32-bit in KissFFT
|
||||||
|
Patch: vtk-CVE-2025-34297.patch
|
||||||
|
|
||||||
URL: https://vtk.org/
|
URL: https://vtk.org/
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
# Allow for testing with different cmake generators.
|
# Allow for testing with different cmake generators.
|
||||||
# make still seems to be faster than ninja, but has failed at times.
|
# make still seems to be faster than ninja, but has failed at times.
|
||||||
%global cmake_gen %{nil}
|
%global _cmake_generator "Unix Makefiles"
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
|
|
@ -108,7 +108,6 @@ BuildRequires: double-conversion-devel
|
||||||
BuildRequires: eigen3-devel
|
BuildRequires: eigen3-devel
|
||||||
BuildRequires: expat-devel
|
BuildRequires: expat-devel
|
||||||
BuildRequires: fast_float-devel
|
BuildRequires: fast_float-devel
|
||||||
BuildRequires: ffmpeg-free-devel
|
|
||||||
%if %{with fmt}
|
%if %{with fmt}
|
||||||
BuildRequires: fmt-devel >= 8.1.0
|
BuildRequires: fmt-devel >= 8.1.0
|
||||||
%endif
|
%endif
|
||||||
|
|
@ -207,7 +206,6 @@ Requires: eigen3-static \
|
||||||
Requires: expat-devel%{?_isa} \
|
Requires: expat-devel%{?_isa} \
|
||||||
# fast_float is noarch and header-only \
|
# fast_float is noarch and header-only \
|
||||||
Requires: fast_float-devel \
|
Requires: fast_float-devel \
|
||||||
Requires: ffmpeg-free-devel%{?_isa} \
|
|
||||||
%if %{with fmt} \
|
%if %{with fmt} \
|
||||||
Requires: fmt-devel%{?_isa} \
|
Requires: fmt-devel%{?_isa} \
|
||||||
%endif \
|
%endif \
|
||||||
|
|
@ -706,7 +704,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%cmake %{cmake_gen} \
|
%cmake \
|
||||||
%{vtk_cmake_options} \
|
%{vtk_cmake_options} \
|
||||||
-DVTK_BUILD_DOCUMENTATION:BOOL=ON \
|
-DVTK_BUILD_DOCUMENTATION:BOOL=ON \
|
||||||
-DVTK_BUILD_EXAMPLES:BOOL=ON \
|
-DVTK_BUILD_EXAMPLES:BOOL=ON \
|
||||||
|
|
@ -722,7 +720,7 @@ do
|
||||||
module load mpi/$mpi-%{_arch}
|
module load mpi/$mpi-%{_arch}
|
||||||
# CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path
|
# CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path
|
||||||
# VTK_MODULE_ENABLE_VTK_FiltersParallelStatistics need MPI modules at the moment
|
# VTK_MODULE_ENABLE_VTK_FiltersParallelStatistics need MPI modules at the moment
|
||||||
%cmake %{cmake_gen} \
|
%cmake \
|
||||||
%{vtk_cmake_options} \
|
%{vtk_cmake_options} \
|
||||||
-DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \
|
-DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \
|
-DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue