From 51558511bdbbcffdce534db21dbaf5d54b31638a Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 1 Feb 2024 11:38:14 +0000 Subject: [PATCH] TIFFReadRGBAStrip/TIFFReadRGBATile: add more validation of col/row (fixes #622) CVE: CVE-2023-52356 Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/51558511bdbbcffdce534db21dbaf5d54b31638a] Signed-off-by: Yogita Urade --- libtiff/tif_getimage.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c index 41f7dfd..9cd6eee 100644 --- a/libtiff/tif_getimage.c +++ b/libtiff/tif_getimage.c @@ -3224,6 +3224,13 @@ int TIFFReadRGBAStripExt(TIFF *tif, uint32_t row, uint32_t *raster, if (TIFFRGBAImageOK(tif, emsg) && TIFFRGBAImageBegin(&img, tif, stop_on_error, emsg)) { + if (row >= img.height) + { + TIFFErrorExtR(tif, TIFFFileName(tif), + "Invalid row passed to TIFFReadRGBAStrip()."); + TIFFRGBAImageEnd(&img); + return (0); + } img.row_offset = row; img.col_offset = 0; @@ -3301,6 +3308,14 @@ int TIFFReadRGBATileExt(TIFF *tif, uint32_t col, uint32_t row, uint32_t *raster, return (0); } + if (col >= img.width || row >= img.height) + { + TIFFErrorExtR(tif, TIFFFileName(tif), + "Invalid row/col passed to TIFFReadRGBATile()."); + TIFFRGBAImageEnd(&img); + return (0); + } + /* * The TIFFRGBAImageGet() function doesn't allow us to get off the * edge of the image, even to fill an otherwise valid tile. So we -- 2.40.0