From 9c22495e5eeeae9e00a1596720c969656bb8d678 Mon Sep 17 00:00:00 2001 From: Su_Laus Date: Fri, 3 Feb 2023 15:31:31 +0100 Subject: [PATCH] CVE-2023-25433 tiffcrop correctly update buffersize after rotateImage() fix#520 rotateImage() set up a new buffer and calculates its size individually. Therefore, seg_buffs[] size needs to be updated accordingly. Before this fix, the seg_buffs buffer size was calculated with a different formula than within rotateImage(). Closes #520. Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/9c22495e5eeeae9e00a1596720c969656bb8d678 && https://gitlab.com/libtiff/libtiff/-/commit/688012dca2c39033aa2dc7bcea9796787cfd1b44] CVE: CVE-2023-25433 Signed-off-by: Hitendra Prajapati --- tools/tiffcrop.c | 78 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 18 deletions(-) diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c index eee26bf..cbd24cc 100644 --- a/tools/tiffcrop.c +++ b/tools/tiffcrop.c @@ -523,7 +523,7 @@ static int rotateContigSamples24bits(uint16_t, uint16_t, uint16_t, uint32_t, static int rotateContigSamples32bits(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, uint32_t, uint8_t *, uint8_t *); static int rotateImage(uint16_t, struct image_data *, uint32_t *, uint32_t *, - unsigned char **, int); + unsigned char **, size_t *); static int mirrorImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, unsigned char *); static int invertImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, @@ -6515,7 +6515,7 @@ static int correct_orientation(struct image_data *image, unsigned char **work_b * but switch xres, yres there. */ uint32_t width = image->width; uint32_t length = image->length; - if (rotateImage(rotation, image, &width, &length, work_buff_ptr, TRUE)) + if (rotateImage(rotation, image, &width, &length, work_buff_ptr, NULL)) { TIFFError ("correct_orientation", "Unable to rotate image"); return (-1); @@ -7695,16 +7695,19 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ { + /* rotateImage() set up a new buffer and calculates its size + * individually. Therefore, seg_buffs size needs to be updated + * accordingly. */ + size_t rot_buf_size = 0; if (rotateImage(crop->rotation, image, &crop->combined_width, - &crop->combined_length, &crop_buff, FALSE)) + &crop->combined_length, &crop_buff, &rot_buf_size)) { TIFFError("processCropSelections", "Failed to rotate composite regions by %"PRIu32" degrees", crop->rotation); return (-1); } seg_buffs[0].buffer = crop_buff; - seg_buffs[0].size = (((crop->combined_width * image->bps + 7 ) / 8) - * image->spp) * crop->combined_length; + seg_buffs[0].size = rot_buf_size; } } else /* Separated Images */ @@ -7804,9 +7807,13 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, { /* rotateImage() changes image->width, ->length, ->xres and ->yres, what it schouldn't do here, when more than one section is processed. * ToDo: Therefore rotateImage() and its usage has to be reworked (e.g. like mirrorImage()) !! - */ - if (rotateImage(crop->rotation, image, &crop->regionlist[i].width, - &crop->regionlist[i].length, &crop_buff, FALSE)) + * Furthermore, rotateImage() set up a new buffer and calculates + * its size individually. Therefore, seg_buffs size needs to be + * updated accordingly. */ + size_t rot_buf_size = 0; + if (rotateImage( + crop->rotation, image, &crop->regionlist[i].width, + &crop->regionlist[i].length, &crop_buff, &rot_buf_size)) { TIFFError("processCropSelections", "Failed to rotate crop region by %"PRIu16" degrees", crop->rotation); @@ -7817,8 +7824,7 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, crop->combined_width = total_width; crop->combined_length = total_length; seg_buffs[i].buffer = crop_buff; - seg_buffs[i].size = (((crop->regionlist[i].width * image->bps + 7 ) / 8) - * image->spp) * crop->regionlist[i].length; + seg_buffs[i].size = rot_buf_size; } } /* for crop->selections loop */ } /* Separated Images (else case) */ @@ -7827,7 +7833,6 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, /* Copy the crop section of the data from the current image into a buffer * and adjust the IFD values to reflect the new size. If no cropping is - * required, use the original read buffer as the crop buffer. * * There is quite a bit of redundancy between this routine and the more * specialized processCropSelections, but this provides @@ -7938,7 +7943,7 @@ createCroppedImage(struct image_data *image, struct crop_mask *crop, if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ { if (rotateImage(crop->rotation, image, &crop->combined_width, - &crop->combined_length, crop_buff_ptr, TRUE)) + &crop->combined_length, crop_buff_ptr, NULL)) { TIFFError("createCroppedImage", "Failed to rotate image or cropped selection by %"PRIu16" degrees", crop->rotation); @@ -8600,14 +8605,16 @@ rotateContigSamples32bits(uint16_t rotation, uint16_t spp, uint16_t bps, uint32_ /* Rotate an image by a multiple of 90 degrees clockwise */ static int -rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width, - uint32_t *img_length, unsigned char **ibuff_ptr, int rot_image_params) +rotateImage(uint16_t rotation, struct image_data *image, + uint32_t *img_width,uint32_t *img_length, + unsigned char **ibuff_ptr, size_t *rot_buf_size) { int shift_width; uint32_t bytes_per_pixel, bytes_per_sample; uint32_t row, rowsize, src_offset, dst_offset; uint32_t i, col, width, length; - uint32_t colsize, buffsize, col_offset, pix_offset; + uint32_t colsize, col_offset, pix_offset; + tmsize_t buffsize; unsigned char *ibuff; unsigned char *src; unsigned char *dst; @@ -8620,12 +8627,41 @@ rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width, spp = image->spp; bps = image->bps; + if ((spp != 0 && bps != 0 && + width > (uint32_t)((UINT32_MAX - 7) / spp / bps)) || + (spp != 0 && bps != 0 && + length > (uint32_t)((UINT32_MAX - 7) / spp / bps))) + { + TIFFError("rotateImage", "Integer overflow detected."); + return (-1); + } + rowsize = ((bps * spp * width) + 7) / 8; colsize = ((bps * spp * length) + 7) / 8; if ((colsize * width) > (rowsize * length)) - buffsize = (colsize + 1) * width; +{ + if (((tmsize_t)colsize + 1) != 0 && + (tmsize_t)width > ((TIFF_TMSIZE_T_MAX - NUM_BUFF_OVERSIZE_BYTES) / + ((tmsize_t)colsize + 1))) + { + TIFFError("rotateImage", + "Integer overflow when calculating buffer size."); + return (-1); + } + buffsize = ((tmsize_t)colsize + 1) * width; + } else - buffsize = (rowsize + 1) * length; + { + if (((tmsize_t)rowsize + 1) != 0 && + (tmsize_t)length > ((TIFF_TMSIZE_T_MAX - NUM_BUFF_OVERSIZE_BYTES) / + ((tmsize_t)rowsize + 1))) + { + TIFFError("rotateImage", + "Integer overflow when calculating buffer size."); + return (-1); + } + buffsize = (rowsize + 1) * length; + } bytes_per_sample = (bps + 7) / 8; bytes_per_pixel = ((bps * spp) + 7) / 8; @@ -8648,11 +8684,17 @@ rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width, /* Add 3 padding bytes for extractContigSamplesShifted32bits */ if (!(rbuff = (unsigned char *)limitMalloc(buffsize + NUM_BUFF_OVERSIZE_BYTES))) { - TIFFError("rotateImage", "Unable to allocate rotation buffer of %1u bytes", buffsize + NUM_BUFF_OVERSIZE_BYTES); + TIFFError("rotateImage", + "Unable to allocate rotation buffer of %" TIFF_SSIZE_FORMAT + " bytes ", + buffsize + NUM_BUFF_OVERSIZE_BYTES); return (-1); } _TIFFmemset(rbuff, '\0', buffsize + NUM_BUFF_OVERSIZE_BYTES); + if (rot_buf_size != NULL) + *rot_buf_size = buffsize; + ibuff = *ibuff_ptr; switch (rotation) { -- 2.25.1