From 6e2dac5f904496d127c92ddc4e56eccfca25c2ee Mon Sep 17 00:00:00 2001 From: Arie Haenel Date: Wed, 19 Jul 2023 19:40:01 +0000 Subject: [PATCH] raw2tiff: fix integer overflow and bypass of the check (fixes #592) Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/6e2dac5f904496d127c92ddc4e56eccfca25c2ee] CVE: CVE-2023-41175 Signed-off-by: Vijay Anusuri --- tools/raw2tiff.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c index dfee715..253c023 100644 --- a/tools/raw2tiff.c +++ b/tools/raw2tiff.c @@ -36,6 +36,7 @@ #include #include #include +#include #ifdef HAVE_UNISTD_H # include @@ -101,6 +102,7 @@ main(int argc, char* argv[]) int fd; char *outfilename = NULL; TIFF *out; + uint32_t temp_limit_check = 0; /* temp for integer overflow checking*/ uint32_t row, col, band; int c; @@ -212,6 +214,33 @@ main(int argc, char* argv[]) if (guessSize(fd, dtype, hdr_size, nbands, swab, &width, &length) < 0) return EXIT_FAILURE; + /* check for integer overflow in */ + /* hdr_size + (*width) * (*length) * nbands * depth */ + + if ((width == 0) || (length == 0) ){ + fprintf(stderr, "Too large nbands value specified.\n"); + return (EXIT_FAILURE); + } + + temp_limit_check = nbands * depth; + + if ( !temp_limit_check || length > ( UINT_MAX / temp_limit_check ) ) { + fprintf(stderr, "Too large length size specified.\n"); + return (EXIT_FAILURE); + } + temp_limit_check = temp_limit_check * length; + + if ( !temp_limit_check || width > ( UINT_MAX / temp_limit_check ) ) { + fprintf(stderr, "Too large width size specified.\n"); + return (EXIT_FAILURE); + } + temp_limit_check = temp_limit_check * width; + + if ( !temp_limit_check || hdr_size > ( UINT_MAX - temp_limit_check ) ) { + fprintf(stderr, "Too large header size specified.\n"); + return (EXIT_FAILURE); + } + if (outfilename == NULL) outfilename = argv[optind+1]; out = TIFFOpen(outfilename, "w"); -- 2.25.1