| From 2f79856097f423eb33796a15fcf700d2ea41bf31 Mon Sep 17 00:00:00 2001 |
| From: erouault <erouault> |
| Date: Mon, 11 Jul 2016 21:38:31 +0000 |
| Subject: [PATCH 2/2] (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 / #2559) |
| |
| CVE: CVE-2016-5323 |
| Upstream-Status: Backport |
| https://github.com/vadz/libtiff/commit/2f79856097f423eb33796a15fcf700d2ea41bf31 |
| |
| Signed-off-by: Yi Zhao <yi.zhao@windirver.com> |
| --- |
| ChangeLog | 2 +- |
| tools/tiffcrop.c | 16 ++++++++-------- |
| 2 files changed, 9 insertions(+), 9 deletions(-) |
| |
| diff --git a/ChangeLog b/ChangeLog |
| index 4e0302f..62dc1b5 100644 |
| --- a/ChangeLog |
| +++ b/ChangeLog |
| @@ -3,7 +3,7 @@ |
| * tools/tiffcrop.c: Avoid access outside of stack allocated array |
| on a tiled separate TIFF with more than 8 samples per pixel. |
| Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360 |
| - (CVE-2016-5321, bugzilla #2558) |
| + (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 / #2559) |
| |
| 2016-07-10 Even Rouault <even.rouault at spatialys.com> |
| |
| diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c |
| index 6fc8fc1..27abc0b 100644 |
| --- a/tools/tiffcrop.c |
| +++ b/tools/tiffcrop.c |
| @@ -3738,7 +3738,7 @@ combineSeparateSamples8bits (uint8 *in[], uint8 *out, uint32 cols, |
| |
| matchbits = maskbits << (8 - src_bit - bps); |
| /* load up next sample from each plane */ |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| buff1 = ((*src) & matchbits) << (src_bit); |
| @@ -3837,7 +3837,7 @@ combineSeparateSamples16bits (uint8 *in[], uint8 *out, uint32 cols, |
| src_bit = bit_offset % 8; |
| |
| matchbits = maskbits << (16 - src_bit - bps); |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| if (little_endian) |
| @@ -3947,7 +3947,7 @@ combineSeparateSamples24bits (uint8 *in[], uint8 *out, uint32 cols, |
| src_bit = bit_offset % 8; |
| |
| matchbits = maskbits << (32 - src_bit - bps); |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| if (little_endian) |
| @@ -4073,7 +4073,7 @@ combineSeparateSamples32bits (uint8 *in[], uint8 *out, uint32 cols, |
| src_bit = bit_offset % 8; |
| |
| matchbits = maskbits << (64 - src_bit - bps); |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| if (little_endian) |
| @@ -4263,7 +4263,7 @@ combineSeparateTileSamples8bits (uint8 *in[], uint8 *out, uint32 cols, |
| |
| matchbits = maskbits << (8 - src_bit - bps); |
| /* load up next sample from each plane */ |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| buff1 = ((*src) & matchbits) << (src_bit); |
| @@ -4362,7 +4362,7 @@ combineSeparateTileSamples16bits (uint8 *in[], uint8 *out, uint32 cols, |
| src_bit = bit_offset % 8; |
| |
| matchbits = maskbits << (16 - src_bit - bps); |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| if (little_endian) |
| @@ -4471,7 +4471,7 @@ combineSeparateTileSamples24bits (uint8 *in[], uint8 *out, uint32 cols, |
| src_bit = bit_offset % 8; |
| |
| matchbits = maskbits << (32 - src_bit - bps); |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| if (little_endian) |
| @@ -4597,7 +4597,7 @@ combineSeparateTileSamples32bits (uint8 *in[], uint8 *out, uint32 cols, |
| src_bit = bit_offset % 8; |
| |
| matchbits = maskbits << (64 - src_bit - bps); |
| - for (s = 0; s < spp; s++) |
| + for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) |
| { |
| src = in[s] + src_offset + src_byte; |
| if (little_endian) |
| -- |
| 2.7.4 |
| |