xref: /OK3568_Linux_fs/yocto/poky/meta/recipes-multimedia/libtiff/tiff/CVE-2022-3970.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From 11c8026913e190b02266c1247e7a770e488d925e Mon Sep 17 00:00:00 2001
2From: Even Rouault <even.rouault@spatialys.com>
3Date: Tue, 8 Nov 2022 15:16:58 +0100
4Subject: [PATCH] TIFFReadRGBATileExt(): fix (unsigned) integer overflow on
5 strips/tiles > 2 GB
6
7Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=53137
8Upstream-Status: Accepted
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 libtiff/tif_getimage.c | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
16index a1b6570b..9a2e0c59 100644
17--- a/libtiff/tif_getimage.c
18+++ b/libtiff/tif_getimage.c
19@@ -3058,15 +3058,15 @@ TIFFReadRGBATileExt(TIFF* tif, uint32_t col, uint32_t row, uint32_t * raster, in
20         return( ok );
21
22     for( i_row = 0; i_row < read_ysize; i_row++ ) {
23-        memmove( raster + (tile_ysize - i_row - 1) * tile_xsize,
24-                 raster + (read_ysize - i_row - 1) * read_xsize,
25+        memmove( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize,
26+                 raster + (size_t)(read_ysize - i_row - 1) * read_xsize,
27                  read_xsize * sizeof(uint32_t) );
28-        _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize+read_xsize,
29+        _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize+read_xsize,
30                      0, sizeof(uint32_t) * (tile_xsize - read_xsize) );
31     }
32
33     for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) {
34-        _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize,
35+        _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize,
36                      0, sizeof(uint32_t) * tile_xsize );
37     }
38
39