!119 fix CVE-2022-3970
From: @foreson Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
324bd6858d
37
backport-CVE-2022-3970.patch
Normal file
37
backport-CVE-2022-3970.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 227500897dfb07fb7d27f7aa570050e62617e3be Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Tue, 8 Nov 2022 15:16:58 +0100
|
||||||
|
Subject: [PATCH] TIFFReadRGBATileExt(): fix (unsigned) integer overflow on
|
||||||
|
strips/tiles > 2 GB
|
||||||
|
|
||||||
|
Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=53137
|
||||||
|
---
|
||||||
|
libtiff/tif_getimage.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
|
||||||
|
index a4d0c1d6..60b94d8e 100644
|
||||||
|
--- a/libtiff/tif_getimage.c
|
||||||
|
+++ b/libtiff/tif_getimage.c
|
||||||
|
@@ -3016,15 +3016,15 @@ TIFFReadRGBATileExt(TIFF* tif, uint32_t col, uint32_t row, uint32_t * raster, in
|
||||||
|
return( ok );
|
||||||
|
|
||||||
|
for( i_row = 0; i_row < read_ysize; i_row++ ) {
|
||||||
|
- memmove( raster + (tile_ysize - i_row - 1) * tile_xsize,
|
||||||
|
- raster + (read_ysize - i_row - 1) * read_xsize,
|
||||||
|
+ memmove( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize,
|
||||||
|
+ raster + (size_t)(read_ysize - i_row - 1) * read_xsize,
|
||||||
|
read_xsize * sizeof(uint32_t) );
|
||||||
|
- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize+read_xsize,
|
||||||
|
+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize+read_xsize,
|
||||||
|
0, sizeof(uint32_t) * (tile_xsize - read_xsize) );
|
||||||
|
}
|
||||||
|
|
||||||
|
for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) {
|
||||||
|
- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize,
|
||||||
|
+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize,
|
||||||
|
0, sizeof(uint32_t) * tile_xsize );
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
10
libtiff.spec
10
libtiff.spec
@ -1,6 +1,6 @@
|
|||||||
Name: libtiff
|
Name: libtiff
|
||||||
Version: 4.3.0
|
Version: 4.3.0
|
||||||
Release: 20
|
Release: 21
|
||||||
Summary: TIFF Library and Utilities
|
Summary: TIFF Library and Utilities
|
||||||
License: libtiff
|
License: libtiff
|
||||||
URL: https://www.simplesystems.org/libtiff/
|
URL: https://www.simplesystems.org/libtiff/
|
||||||
@ -33,6 +33,8 @@ Patch6023: backport-CVE-2022-3599.patch
|
|||||||
|
|
||||||
Patch9000: fix-raw2tiff-floating-point-exception.patch
|
Patch9000: fix-raw2tiff-floating-point-exception.patch
|
||||||
|
|
||||||
|
Patch6024: backport-CVE-2022-3970.patch
|
||||||
|
|
||||||
BuildRequires: gcc gcc-c++ zlib-devel libjpeg-devel jbigkit-devel
|
BuildRequires: gcc gcc-c++ zlib-devel libjpeg-devel jbigkit-devel
|
||||||
BuildRequires: libtool automake autoconf pkgconfig
|
BuildRequires: libtool automake autoconf pkgconfig
|
||||||
|
|
||||||
@ -152,6 +154,12 @@ find html -name 'Makefile*' | xargs rm
|
|||||||
%exclude %{_datadir}/html/man/tiffgt.1.html
|
%exclude %{_datadir}/html/man/tiffgt.1.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 17 2022 qisen <qisen@huawei.com> - 4.3.0-21
|
||||||
|
- Type:cve
|
||||||
|
- ID:CVE-2022-3970
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix CVE-2022-3970
|
||||||
|
|
||||||
* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.3.0-20
|
* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.3.0-20
|
||||||
- fix CVE-2022-3570,CVE-2022-3597,CVE-2022-3598,CVE-2022-3599,CVE-2022-3626,CVE-2022-3627
|
- fix CVE-2022-3570,CVE-2022-3597,CVE-2022-3598,CVE-2022-3599,CVE-2022-3626,CVE-2022-3627
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user