mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
tiff: Security fix for CVE-2022-3970
This patch contains a fix for CVE-2022-3970
Reference:
https://nvd.nist.gov/vuln/detail/CVE-2022-3970
https://security-tracker.debian.org/tracker/CVE-2022-3970
Patch generated from :
227500897d
(From OE-Core rev: d4b231e1baa0c4c6fa8eaa2e25170eeb29cd1cdf)
Signed-off-by: Zheng Qiu <zheng.qiu@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0f37d51b2c
commit
38f46024d7
38
meta/recipes-multimedia/libtiff/tiff/CVE-2022-3970.patch
Normal file
38
meta/recipes-multimedia/libtiff/tiff/CVE-2022-3970.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
From 11c8026913e190b02266c1247e7a770e488d925e 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
|
||||
Upstream-Status: Accepted
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
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 a1b6570b..9a2e0c59 100644
|
||||
--- a/libtiff/tif_getimage.c
|
||||
+++ b/libtiff/tif_getimage.c
|
||||
@@ -3058,15 +3058,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 );
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
|
||||
file://b258ed69a485a9cfb299d9f060eb2a46c54e5903.patch \
|
||||
file://0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch \
|
||||
file://CVE-2022-2953.patch \
|
||||
file://CVE-2022-3970.patch \
|
||||
file://0001-Revised-handling-of-TIFFTAG_INKNAMES-and-related-TIF.patch \
|
||||
file://0001-tiffcrop-S-option-Make-decision-simpler.patch \
|
||||
file://0001-tiffcrop-disable-incompatibility-of-Z-X-Y-z-options-.patch \
|
||||
|
||||
Reference in New Issue
Block a user