From bbb113aebba6dc0743aedd8fe129a8d82c678267 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Jul 2020 04:13:56 -0400 Subject: [PATCH] import openjpeg2-2.3.1-6.el8 --- SOURCES/openjpeg2_CVE-2020-6851.patch | 32 +++++++++++++++++++ SOURCES/openjpeg2_CVE-2020-8112.patch | 46 +++++++++++++++++++++++++++ SPECS/openjpeg2.spec | 14 +++++++- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 SOURCES/openjpeg2_CVE-2020-6851.patch create mode 100644 SOURCES/openjpeg2_CVE-2020-8112.patch diff --git a/SOURCES/openjpeg2_CVE-2020-6851.patch b/SOURCES/openjpeg2_CVE-2020-6851.patch new file mode 100644 index 0000000..4a2029b --- /dev/null +++ b/SOURCES/openjpeg2_CVE-2020-6851.patch @@ -0,0 +1,32 @@ +From 36dc8ffca8c085423149bb028da5688936c88c68 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 11 Jan 2020 01:51:19 +0100 +Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose + coordinates are beyond INT_MAX (fixes #1228) + +--- + src/lib/openjp2/j2k.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c +index 4169cd6..9e9a30f 100644 +--- a/src/lib/openjp2/j2k.c ++++ b/src/lib/openjp2/j2k.c +@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image, + l_img_comp = p_image->comps; + for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { + OPJ_INT32 l_h, l_w; ++ if (p_image->x0 > (OPJ_UINT32)INT_MAX || ++ p_image->y0 > (OPJ_UINT32)INT_MAX || ++ p_image->x1 > (OPJ_UINT32)INT_MAX || ++ p_image->y1 > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(p_manager, EVT_ERROR, ++ "Image coordinates above INT_MAX are not supported\n"); ++ return OPJ_FALSE; ++ } + + l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, + (OPJ_INT32)l_img_comp->dx); +-- +2.21.1 + diff --git a/SOURCES/openjpeg2_CVE-2020-8112.patch b/SOURCES/openjpeg2_CVE-2020-8112.patch new file mode 100644 index 0000000..b3da355 --- /dev/null +++ b/SOURCES/openjpeg2_CVE-2020-8112.patch @@ -0,0 +1,46 @@ +From dc315cbd2d8582498c885a55ea73ecc84634168b Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Thu, 30 Jan 2020 00:59:57 +0100 +Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow + +That could lead to later assertion failures. + +Fixes #1231 / CVE-2020-8112 +--- + src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c +index be3b843..647991c 100644 +--- a/src/lib/openjp2/tcd.c ++++ b/src/lib/openjp2/tcd.c +@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, + /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ + l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; + l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; +- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; +- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, ++ (OPJ_INT32)l_pdx)) << l_pdx; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_x_end = (OPJ_INT32)tmp; ++ } ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, ++ (OPJ_INT32)l_pdy)) << l_pdy; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_y_end = (OPJ_INT32)tmp; ++ } + /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ + + l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( +-- +2.21.1 + diff --git a/SPECS/openjpeg2.spec b/SPECS/openjpeg2.spec index 00962cc..6e51bb9 100644 --- a/SPECS/openjpeg2.spec +++ b/SPECS/openjpeg2.spec @@ -5,7 +5,7 @@ Name: openjpeg2 Version: 2.3.1 -Release: 4%{?dist} +Release: 6%{?dist} Summary: C-Library for JPEG 2000 # windirent.h is MIT, the rest is BSD @@ -23,6 +23,12 @@ Patch0: openjpeg2_opj2.patch # Fix Coverity issues Patch1: openjpeg2_coverity.patch +# Fix for CVE-2020-6851 +Patch2: openjpeg2_CVE-2020-6851.patch + +# Fix for CVE-2020-8112 +Patch3: openjpeg2_CVE-2020-8112.patch + BuildRequires: cmake BuildRequires: gcc BuildRequires: make @@ -326,6 +332,12 @@ make test -C %{_target_platform} %changelog +* Mon Feb 10 2020 Nikola Forró - 2.3.1-6 +- Fix CVE-2020-8112 (#1801034) + +* Tue Jan 14 2020 Nikola Forró - 2.3.1-5 +- Fix CVE-2020-6851 (#1790590) + * Wed Dec 04 2019 Nikola Forró - 2.3.1-4 - Add upstream test suite and enable it in gating