diff --git a/.gitignore b/.gitignore index 99766a1..98cbda7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /openjpeg-2.1.0.tar.gz /version.2.1.tar.gz /openjpeg-2.1.1.tar.gz +/openjpeg-2.1.2.tar.gz diff --git a/c16bc057ba3f125051c9966cf1f5b68a05681de4.patch b/c16bc057ba3f125051c9966cf1f5b68a05681de4.patch deleted file mode 100644 index 137a02d..0000000 --- a/c16bc057ba3f125051c9966cf1f5b68a05681de4.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001 -From: trylab -Date: Tue, 6 Sep 2016 13:55:49 +0800 -Subject: [PATCH] Fix an integer overflow issue (#809) - -Prevent an integer overflow issue in function opj_pi_create_decode of -pi.c. ---- - src/lib/openjp2/pi.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c -index cffad66..36e2ff0 100644 ---- a/src/lib/openjp2/pi.c -+++ b/src/lib/openjp2/pi.c -@@ -1237,7 +1237,13 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image, - l_current_pi = l_pi; - - /* memory allocation for include */ -- l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); -+ /* prevent an integer overflow issue */ -+ l_current_pi->include = 00; -+ if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U))) -+ { -+ l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); -+ } -+ - if - (!l_current_pi->include) - { diff --git a/e078172b1c3f98d2219c37076b238fb759c751ea.patch b/e078172b1c3f98d2219c37076b238fb759c751ea.patch deleted file mode 100644 index 96e336e..0000000 --- a/e078172b1c3f98d2219c37076b238fb759c751ea.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e078172b1c3f98d2219c37076b238fb759c751ea Mon Sep 17 00:00:00 2001 -From: Matthieu Darbois -Date: Thu, 8 Sep 2016 00:24:15 +0200 -Subject: [PATCH] Add sanity check for tile coordinates (#823) - -Coordinates are casted from OPJ_UINT32 to OPJ_INT32 -Add sanity check for negative values and upper bound becoming lower -than lower bound. -See also -https://pdfium.googlesource.com/pdfium/+/b6befb2ed2485a3805cddea86dc7574510178ea9 ---- - src/lib/openjp2/tcd.c | 11 +++++++++++ - tests/compare_dump_files.c | 14 +++++++------- - tests/nonregression/test_suite.ctest.in | 3 +++ - 3 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c -index 12da05c..7a29c49 100644 ---- a/src/lib/openjp2/tcd.c -+++ b/src/lib/openjp2/tcd.c -@@ -696,9 +696,20 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, - l_tx0 = l_cp->tx0 + p * l_cp->tdx; /* can't be greater than l_image->x1 so won't overflow */ - l_tile->x0 = (OPJ_INT32)opj_uint_max(l_tx0, l_image->x0); - l_tile->x1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_tx0, l_cp->tdx), l_image->x1); -+ /* all those OPJ_UINT32 are casted to OPJ_INT32, let's do some sanity check */ -+ if ((l_tile->x0 < 0) || (l_tile->x1 <= l_tile->x0)) { -+ opj_event_msg(manager, EVT_ERROR, "Tile X coordinates are not supported\n"); -+ return OPJ_FALSE; -+ } - l_ty0 = l_cp->ty0 + q * l_cp->tdy; /* can't be greater than l_image->y1 so won't overflow */ - l_tile->y0 = (OPJ_INT32)opj_uint_max(l_ty0, l_image->y0); - l_tile->y1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_ty0, l_cp->tdy), l_image->y1); -+ /* all those OPJ_UINT32 are casted to OPJ_INT32, let's do some sanity check */ -+ if ((l_tile->y0 < 0) || (l_tile->y1 <= l_tile->y0)) { -+ opj_event_msg(manager, EVT_ERROR, "Tile Y coordinates are not supported\n"); -+ return OPJ_FALSE; -+ } -+ - - /* testcase 1888.pdf.asan.35.988 */ - if (l_tccp->numresolutions == 0) { -diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c -index 946c92a..7d22270 100644 ---- a/tests/compare_dump_files.c -+++ b/tests/compare_dump_files.c -@@ -118,10 +118,10 @@ int main(int argc, char **argv) - test_cmp_parameters inParam; - FILE *fbase=NULL, *ftest=NULL; - int same = 0; -- char lbase[256]; -- char strbase[256]; -- char ltest[256]; -- char strtest[256]; -+ char lbase[512]; -+ char strbase[512]; -+ char ltest[512]; -+ char strtest[512]; - - if( parse_cmdline_cmp(argc, argv, &inParam) == 1 ) - { -@@ -154,9 +154,9 @@ int main(int argc, char **argv) - - while (fgets(lbase, sizeof(lbase), fbase) && fgets(ltest,sizeof(ltest),ftest)) - { -- int nbase = sscanf(lbase, "%255[^\r\n]", strbase); -- int ntest = sscanf(ltest, "%255[^\r\n]", strtest); -- assert( nbase != 255 && ntest != 255 ); -+ int nbase = sscanf(lbase, "%511[^\r\n]", strbase); -+ int ntest = sscanf(ltest, "%511[^\r\n]", strtest); -+ assert( nbase != 511 && ntest != 511 ); - if( nbase != 1 || ntest != 1 ) - { - fprintf(stderr, "could not parse line from files\n" ); -diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in -index bbf1e77..2dfabfb 100644 ---- a/tests/nonregression/test_suite.ctest.in -+++ b/tests/nonregression/test_suite.ctest.in -@@ -564,3 +564,5 @@ opj_decompress -i @INPUT_NR_PATH@/issue7 - # issue 775 - !opj_decompress -i @INPUT_NR_PATH@/issue775.j2k -o @TEMP_PATH@/issue775.png - !opj_decompress -i @INPUT_NR_PATH@/issue775-2.j2k -o @TEMP_PATH@/issue775-2.png -+# issue 823 (yes, not a typo, test image is issue822) -+!opj_decompress -i @INPUT_NR_PATH@/issue822.jp2 -o @TEMP_PATH@/issue822.png - diff --git a/ef01f18dfc6780b776d0674ed3e7415c6ef54d24.patch b/ef01f18dfc6780b776d0674ed3e7415c6ef54d24.patch deleted file mode 100644 index 99578ae..0000000 --- a/ef01f18dfc6780b776d0674ed3e7415c6ef54d24.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ef01f18dfc6780b776d0674ed3e7415c6ef54d24 Mon Sep 17 00:00:00 2001 -From: Matthieu Darbois -Date: Thu, 8 Sep 2016 07:34:46 +0200 -Subject: [PATCH] Cast to size_t before multiplication - -Need to cast to size_t before multiplication otherwise overflow check is useless. ---- - src/lib/openjp2/pi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c -index 36e2ff0..809b33d 100644 ---- a/src/lib/openjp2/pi.c -+++ b/src/lib/openjp2/pi.c -@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image, - l_current_pi->include = 00; - if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U))) - { -- l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); -+ l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16)); - } - - if diff --git a/openjpeg2.spec b/openjpeg2.spec index 8cd8b8b..44d2718 100644 --- a/openjpeg2.spec +++ b/openjpeg2.spec @@ -4,8 +4,8 @@ #global optional_components 1 Name: openjpeg2 -Version: 2.1.1 -Release: 3%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: C-Library for JPEG 2000 # windirent.h is MIT, the rest is BSD @@ -19,12 +19,6 @@ Source1: data.tar.xz # Remove bundled libraries Patch0: openjpeg2_remove-thirdparty.patch -# Backport: Prevent an integer overflow issue in function opj_pi_create_decode of pi.c. (CVE-2016-7163) -Patch1: c16bc057ba3f125051c9966cf1f5b68a05681de4.patch -# Backport: Need to cast to size_t before multiplication otherwise overflow check is useless. (CVE-2016-7163) -Patch2: ef01f18dfc6780b776d0674ed3e7415c6ef54d24.patch -# Backport: Add sanity check for tile coordinates (#1374337) -Patch3: e078172b1c3f98d2219c37076b238fb759c751ea.patch BuildRequires: cmake BuildRequires: zlib-devel @@ -201,9 +195,6 @@ OpenJPEG2 JP3D module command line tools %prep %setup -q -n openjpeg-%{version} %{?runcheck:-a 1} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 # Remove all third party libraries just to be sure rm -rf thirdparty @@ -333,6 +324,10 @@ make test -C %{_target_platform} %changelog +* Wed Sep 28 2016 Sandro Mani - 2.1.2-1 +- Update to 2.1.2 +- Fixes: CVE-2016-7445 + * Fri Sep 09 2016 Sandro Mani - 2.1.1-3 - Backport: Add sanity check for tile coordinates (#1374337) diff --git a/sources b/sources index cd89bee..1e38156 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0cc4b2aee0a9b6e9e21b7abcd201a3ec openjpeg-2.1.1.tar.gz +40a7bfdcc66280b3c1402a0eb1a27624 openjpeg-2.1.2.tar.gz