From 7808740e100ba30ffb791044f3b14dec3e85ed6f Mon Sep 17 00:00:00 2001 From: Markus Koschany Date: Tue, 21 Feb 2023 14:26:43 +0100 Subject: [PATCH] CVE-2023-0795 This is also the fix for CVE-2023-0796, CVE-2023-0797, CVE-2023-0798, CVE-2023-0799. Bug-Debian: https://bugs.debian.org/1031632 Origin: https://gitlab.com/libtiff/libtiff/-/commit/afaabc3e50d4e5d80a94143f7e3c997e7e410f68 Upstream-Status: Backport [import from debian http://security.debian.org/debian-security/pool/updates/main/t/tiff/tiff_4.1.0+git191117-2~deb10u7.debian.tar.xz ] CVE: CVE-2023-0795 CVE-2023-0796 CVE-2023-0797 CVE-2023-0798 CVE-2023-0799 Signed-off-by: Chee Yang Lee Signed-off-by: Hitendra Prajapati --- tools/tiffcrop.c | 51 ++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c index adf0f84..deba170 100644 --- a/tools/tiffcrop.c +++ b/tools/tiffcrop.c @@ -269,7 +269,6 @@ struct region { uint32_t width; /* width in pixels */ uint32_t length; /* length in pixels */ uint32_t buffsize; /* size of buffer needed to hold the cropped region */ - unsigned char *buffptr; /* address of start of the region */ }; /* Cropping parameters from command line and image data @@ -524,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 **); + unsigned char **, int); 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, @@ -5219,7 +5218,6 @@ initCropMasks (struct crop_mask *cps) cps->regionlist[i].width = 0; cps->regionlist[i].length = 0; cps->regionlist[i].buffsize = 0; - cps->regionlist[i].buffptr = NULL; cps->zonelist[i].position = 0; cps->zonelist[i].total = 0; } @@ -6511,8 +6509,13 @@ static int correct_orientation(struct image_data *image, unsigned char **work_b (uint16_t) (image->adjustments & ROTATE_ANY)); return (-1); } - - if (rotateImage(rotation, image, &image->width, &image->length, work_buff_ptr)) + + /* Dummy variable in order not to switch two times the + * image->width,->length within rotateImage(), + * 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)) { TIFFError ("correct_orientation", "Unable to rotate image"); return (-1); @@ -6580,7 +6583,6 @@ extractCompositeRegions(struct image_data *image, struct crop_mask *crop, /* These should not be needed for composite images */ crop->regionlist[i].width = crop_width; crop->regionlist[i].length = crop_length; - crop->regionlist[i].buffptr = crop_buff; src_rowsize = ((img_width * bps * spp) + 7) / 8; dst_rowsize = (((crop_width * bps * count) + 7) / 8); @@ -6817,7 +6819,6 @@ extractSeparateRegion(struct image_data *image, struct crop_mask *crop, crop->regionlist[region].width = crop_width; crop->regionlist[region].length = crop_length; - crop->regionlist[region].buffptr = crop_buff; src = read_buff; dst = crop_buff; @@ -7695,7 +7696,7 @@ 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 */ { if (rotateImage(crop->rotation, image, &crop->combined_width, - &crop->combined_length, &crop_buff)) + &crop->combined_length, &crop_buff, FALSE)) { TIFFError("processCropSelections", "Failed to rotate composite regions by %"PRIu32" degrees", crop->rotation); @@ -7805,7 +7806,7 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, * 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)) + &crop->regionlist[i].length, &crop_buff, FALSE)) { TIFFError("processCropSelections", "Failed to rotate crop region by %"PRIu16" degrees", crop->rotation); @@ -7937,7 +7938,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)) + &crop->combined_length, crop_buff_ptr, TRUE)) { TIFFError("createCroppedImage", "Failed to rotate image or cropped selection by %"PRIu16" degrees", crop->rotation); @@ -8600,7 +8601,7 @@ 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) + uint32_t *img_length, unsigned char **ibuff_ptr, int rot_image_params) { int shift_width; uint32_t bytes_per_pixel, bytes_per_sample; @@ -8791,11 +8792,15 @@ rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width, *img_width = length; *img_length = width; - image->width = length; - image->length = width; - res_temp = image->xres; - image->xres = image->yres; - image->yres = res_temp; + /* Only toggle image parameters if whole input image is rotated. */ + if (rot_image_params) + { + image->width = length; + image->length = width; + res_temp = image->xres; + image->xres = image->yres; + image->yres = res_temp; + } break; case 270: if ((bps % 8) == 0) /* byte aligned data */ @@ -8868,11 +8873,15 @@ rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width, *img_width = length; *img_length = width; - image->width = length; - image->length = width; - res_temp = image->xres; - image->xres = image->yres; - image->yres = res_temp; + /* Only toggle image parameters if whole input image is rotated. */ + if (rot_image_params) + { + image->width = length; + image->length = width; + res_temp = image->xres; + image->xres = image->yres; + image->yres = res_temp; + } break; default: break; -- 2.25.1