From f267f3732157c9e513088eae47c382107be62636 Mon Sep 17 00:00:00 2001 From: yanggao Date: Wed, 1 Mar 2023 18:46:20 +0800 Subject: [PATCH] =?UTF-8?q?CVE-2020-15503=E5=AE=89=E5=85=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0:=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=85=A5=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E9=94=99=E8=AF=AF=E6=BC=8F=E6=B4=9E=EF=BC=8C=E8=AF=A5?= =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E6=BA=90=E4=BA=8E=E7=A8=8B=E5=BA=8F=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=A3=80=E6=9F=A5=E7=BC=A9=E7=95=A5=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ libraw/libraw_const.h | 5 +++++ src/libraw_cxx.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/debian/changelog b/debian/changelog index f9d45cd..24b15c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libraw (0.19.5-ok3) yangtze; urgency=medium + + * kimjuncotton_y CVE-2020-15503安全更新:修复输入验证错误漏洞，该漏洞源于程序没有检查缩略图的大小. + + -- yanggao Wed, 01 Mar 2023 18:45:32 +0800 + libraw (0.19.5-ok2) yangtze; urgency=medium * Fix symbols error. diff --git a/libraw/libraw_const.h b/libraw/libraw_const.h index 66fae4d..11c4043 100644 --- a/libraw/libraw_const.h +++ b/libraw/libraw_const.h @@ -24,6 +24,11 @@ it under the terms of the one of two licenses as you choose: #define LIBRAW_MAX_ALLOC_MB 2048L #endif +/* limit thumbnail size, default is 512Mb*/ +#ifndef LIBRAW_MAX_THUMBNAIL_MB +#define LIBRAW_MAX_THUMBNAIL_MB 512L +#endif + /* Change to non-zero to allow (broken) CRW (and other) files metadata loop prevention */ #ifndef LIBRAW_METADATA_LOOP_PREVENTION diff --git a/src/libraw_cxx.cpp b/src/libraw_cxx.cpp index 51d0ebb..ab18085 100644 --- a/src/libraw_cxx.cpp +++ b/src/libraw_cxx.cpp @@ -3712,6 +3712,20 @@ libraw_processed_image_t *LibRaw::dcraw_make_mem_thumb(int *errcode) return NULL; } + if (T.tlength < 64u) + { + if (errcode) + *errcode = EINVAL; + return NULL; + } + + if (INT64(T.tlength) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) + { + if (errcode) + *errcode = LIBRAW_TOO_BIG; + return NULL; + } + if (T.tformat == LIBRAW_THUMBNAIL_BITMAP) { libraw_processed_image_t *ret = (libraw_processed_image_t *)::malloc(sizeof(libraw_processed_image_t) + T.tlength); @@ -3976,6 +3990,12 @@ void LibRaw::kodak_thumb_loader() if (ID.toffset + est_datasize > ID.input->size() + THUMB_READ_BEYOND) throw LIBRAW_EXCEPTION_IO_EOF; + if(INT64(T.theight) * INT64(T.twidth) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) + throw LIBRAW_EXCEPTION_IO_CORRUPT; + + if (INT64(T.theight) * INT64(T.twidth) < 64ULL) + throw LIBRAW_EXCEPTION_IO_CORRUPT; + // some kodak cameras ushort s_height = S.height, s_width = S.width, s_iwidth = S.iwidth, s_iheight = S.iheight; ushort s_flags = libraw_internal_data.unpacker_data.load_flags; @@ -4237,6 +4257,25 @@ int LibRaw::unpack_thumb(void) CHECK_ORDER_LOW(LIBRAW_PROGRESS_IDENTIFY); CHECK_ORDER_BIT(LIBRAW_PROGRESS_THUMB_LOAD); +#define THUMB_SIZE_CHECKT(A) \ + do { \ + if (INT64(A) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ + if (INT64(A) > 0 && INT64(A) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ + } while (0) + +#define THUMB_SIZE_CHECKTNZ(A) \ + do { \ + if (INT64(A) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ + if (INT64(A) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ + } while (0) + + +#define THUMB_SIZE_CHECKWH(W,H) \ + do { \ + if (INT64(W)*INT64(H) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ + if (INT64(W)*INT64(H) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ + } while (0) + try { if (!libraw_internal_data.internal_data.input) @@ -4267,6 +4306,7 @@ int LibRaw::unpack_thumb(void) if (INT64(ID.toffset) + tsize > ID.input->size() + THUMB_READ_BEYOND) throw LIBRAW_EXCEPTION_IO_EOF; + THUMB_SIZE_CHECKT(tsize); } else { @@ -4280,6 +4320,8 @@ int LibRaw::unpack_thumb(void) ID.input->seek(ID.toffset, SEEK_SET); if (write_thumb == &LibRaw::jpeg_thumb) { + THUMB_SIZE_CHECKTNZ(T.tlength); + if (T.thumb) free(T.thumb); T.thumb = (char *)malloc(T.tlength); @@ -4326,6 +4368,7 @@ int LibRaw::unpack_thumb(void) { if (t_bytesps > 1) throw LIBRAW_EXCEPTION_IO_CORRUPT; // 8-bit thumb, but parsed for more bits + THUMB_SIZE_CHECKWH(T.twidth, T.theight); int t_length = T.twidth * T.theight * t_colors; if (T.tlength && T.tlength < t_length) // try to find tiff ifd with needed offset @@ -4351,6 +4394,7 @@ int LibRaw::unpack_thumb(void) T.tcolors = 1; } T.tlength = total_size; + THUMB_SIZE_CHECKTNZ(T.tlength); if (T.thumb) free(T.thumb); T.thumb = (char *)malloc(T.tlength); @@ -4384,6 +4428,8 @@ int LibRaw::unpack_thumb(void) if (T.thumb) free(T.thumb); + THUMB_SIZE_CHECKTNZ(T.tlength); + T.thumb = (char *)malloc(T.tlength); if (!T.tcolors) T.tcolors = t_colors; @@ -4404,6 +4450,10 @@ int LibRaw::unpack_thumb(void) int i_length = T.twidth * T.theight * t_colors * 2; if (!T.tlength) T.tlength = o_length; + THUMB_SIZE_CHECKTNZ(o_length); + THUMB_SIZE_CHECKTNZ(i_length); + THUMB_SIZE_CHECKTNZ(T.tlength); + ushort *t_thumb = (ushort *)calloc(i_length, 1); ID.input->read(t_thumb, 1, i_length); if ((libraw_internal_data.unpacker_data.order == 0x4949) == (ntohs(0x1234) == 0x1234)) -- Gitee