CVE-2017-1000450

opencv-CVE-2017-1000450.patch

@@ -0,0 +1,13 @@
+diff -urNp old/modules/imgcodecs/src/grfmt_bmp.cpp new/modules/imgcodecs/src/grfmt_bmp.cpp
+--- old/modules/imgcodecs/src/grfmt_bmp.cpp	2018-04-10 12:43:48.636921073 +0200
++++ new/modules/imgcodecs/src/grfmt_bmp.cpp	2018-04-10 12:49:30.394233343 +0200
+@@ -368,6 +368,9 @@ decode_rle4_bad: ;
+                                                 gray_palette[code] );
+ 
+                         line_end_flag = y - prev_y;
++
++                        if( y >= m_height )
++                            break;
+                     }
+                     else if( code > 2 ) // absolute mode
+                     {

opencv-CVE-2017-17760.patch

@@ -0,0 +1,12 @@
+diff -urNp old/modules/imgcodecs/src/grfmt_pxm.cpp new/modules/imgcodecs/src/grfmt_pxm.cpp
+--- old/modules/imgcodecs/src/grfmt_pxm.cpp	2018-04-10 12:40:15.926177118 +0200
++++ new/modules/imgcodecs/src/grfmt_pxm.cpp	2018-04-10 12:42:39.932022243 +0200
+@@ -309,7 +309,7 @@ bool  PxMDecoder::readData( Mat& img )
+                         }
+                     }
+                     else
+-                        memcpy( data, src, CV_ELEM_SIZE1(m_type)*m_width);
++                        memcpy( data, src, img.elemSize1()*m_width);
+                 }
+                 else
+                 {

opencv.spec

@@ -34,7 +34,7 @@
 
 Name:           opencv
 Version:        3.2.0
-Release:        13%{?dist}
+Release:        15%{?dist}
 Summary:        Collection of algorithms for computer vision
 Group:          Development/Libraries
 # This is normal three clause BSD.
@@ -65,6 +65,8 @@ Source1:        %{name}_contrib-clean-%{version}.tar.gz
 Patch1:         opencv-3.2.0-cmake_paths.patch
 Patch2:         opencv-3.1-pillow.patch
 Patch3:         opencv-3.2.0-test-file-fix.patch
+Patch4:         opencv-CVE-2017-17760.patch
+Patch5:         opencv-CVE-2017-1000450.patch
 
 BuildRequires:  libtool
 BuildRequires:  cmake >= 2.6.3
@@ -222,6 +224,9 @@ rm -rf modules/dnn/
 %patch3 -p1 -b .fixtest
 popd
 
+%patch4 -p1 -b .CVE-2017-17760
+%patch5 -p1 -b .CVE-2017-1000450
+
 # fix dos end of lines
 #sed -i 's|\r||g'  samples/c/adaptiveskindetector.cpp
 
@@ -393,6 +398,13 @@ popd
 %{_libdir}/libopencv_xphoto.so.%{abiver}*
 
 %changelog
+* Tue Apr 10 2018 Josef Ridky <jridky@redhat.com> - 3.2.0-15
+- Fix for CVE-2017-17760 (#1530748)
+- Fix for CVE-2017-1000450 (#1531611)
+
+* Sun Jan 28 2018 Sérgio Basto <sergio@serjux.com> - 3.2.0-14
+- Rebuilt (#1533660)
+
 * Sat Oct 28 2017 Sérgio Basto <sergio@serjux.com> - 3.2.0-13
 - Require python3-numpy instead numpy for opencv-python3 (#1504555)