package/openjpeg: security bump to version 2.4.0
PATCH 1/1 package/openjpeg: security bump to version 2.4.0
- Drop upstreamed patches
- Update indentation in hash file (two spaces)
- Fix CVE-2020-27814, CVE-2020-27823, CVE-2020-27824 and CVE-2020-27841 to CVE-2020-27845
https://github.com/uclouvain/openjpeg/releases/v2.4.0
--- ...detect-invalid-file-dimensions-early.patch | 71 --------------- ...4_data-avoid-potential-infinite-loop.patch | 86 ------------------- ...ions-reject-images-whose-coordinates.patch | 32 ------- ...tcd_init_tile-avoid-integer-overflow.patch | 46 ---------- ...on-input-directory-with-mix-of-valid.patch | 43 ---------- package/openjpeg/openjpeg.hash | 4 +- package/openjpeg/openjpeg.mk | 15 +--- 7 files changed, 3 insertions(+), 294 deletions(-) delete mode 100644 package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch delete mode 100644 package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch delete mode 100644 package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch delete mode 100644 package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch delete mode 100644 package/openjpeg/0008-opj_decompress-fix-double-free-on-input-directory-with-mix-of-valid.patch
package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch deleted +0 -71
@@ -1,71 +0,0 @@ -From 21399f6b7d318fcdf4406d5e88723c4922202aa3 Mon Sep 17 00:00:00 2001 -From: Young Xiao <[email protected]> -Date: Sat, 16 Mar 2019 19:57:27 +0800 -Subject: [PATCH] convertbmp: detect invalid file dimensions early - -width/length dimensions read from bmp headers are not necessarily -valid. For instance they may have been maliciously set to very large -values with the intention to cause DoS (large memory allocation, stack -overflow). In these cases we want to detect the invalid size as early -as possible. - -This commit introduces a counter which verifies that the number of -written bytes corresponds to the advertized width/length. - -See commit 8ee335227bbc for details. - -Signed-off-by: Young Xiao <[email protected]> -[Retrieved from: -https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - src/bin/jp2/convertbmp.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/bin/jp2/convertbmp.c b/src/bin/jp2/convertbmp.c -index 0af52f816..ec34f535b 100644 ---- a/src/bin/jp2/convertbmp.c -+++ b/src/bin/jp2/convertbmp.c -@@ -622,13 +622,13 @@ static OPJ_BOOL bmp_read_rle8_data(FILE* IN, OPJ_UINT8* pData, - static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, - OPJ_UINT32 stride, OPJ_UINT32 width, OPJ_UINT32 height) - { -- OPJ_UINT32 x, y; -+ OPJ_UINT32 x, y, written; - OPJ_UINT8 *pix; - const OPJ_UINT8 *beyond; - - beyond = pData + stride * height; - pix = pData; -- x = y = 0U; -+ x = y = written = 0U; - while (y < height) { - int c = getc(IN); - if (c == EOF) { -@@ -642,6 +642,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, - for (j = 0; (j < c) && (x < width) && - ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) { - *pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU)); -+ written++; - } - } else { /* absolute mode */ - c = getc(IN); -@@ -671,6 +672,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, - c1 = (OPJ_UINT8)getc(IN); - } - *pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU)); -+ written++; - } - if (((c & 3) == 1) || ((c & 3) == 2)) { /* skip padding byte */ - getc(IN); -@@ -678,6 +680,10 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, - } - } - } /* while(y < height) */ -+ if (written != width * height) { -+ fprintf(stderr, "warning, image's actual size does not match advertized one\n"); -+ return OPJ_FALSE; -+ } - return OPJ_TRUE; - } -
package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch deleted +0 -86
86 lines not on this page · raw message
package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 -From: Even Rouault <[email protected]> -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) - -[Retrieved from: -https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - 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 14f6ff41a..922550eb1 100644 ---- a/src/lib/openjp2/j2k.c -+++ b/src/lib/openjp2/j2k.c -@@ -9221,6 +9221,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);
package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch deleted +0 -46
46 lines not on this page · raw message
package/openjpeg/0008-opj_decompress-fix-double-free-on-input-directory-with-mix-of-valid.patch deleted +0 -43
43 lines not on this page · raw message
package/openjpeg/openjpeg.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed: -sha256 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 openjpeg-2.3.1.tar.gz -sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE +sha256 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d openjpeg-2.4.0.tar.gz +sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE
package/openjpeg/openjpeg.mk +1 -14
@@ -4,25 +4,12 @@ # ################################################################################ -OPENJPEG_VERSION = 2.3.1 +OPENJPEG_VERSION = 2.4.0 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE OPENJPEG_INSTALL_STAGING = YES -# 0004-convertbmp-detect-invalid-file-dimensions-early.patch -# 0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch -OPENJPEG_IGNORE_CVES += CVE-2019-12973 - -# 0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch -OPENJPEG_IGNORE_CVES += CVE-2020-6851 - -# 0007-opj_tcd_init_tile-avoid-integer-overflow.patch -OPENJPEG_IGNORE_CVES += CVE-2020-8112 - -# 0008-opj_decompress-fix-double-free-on-input-directory-with-mix-of-valid.patch -OPENJPEG_IGNORE_CVES += CVE-2020-15389 - OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff)
Signature · 1 line
2.29.2
PATCH 1/1 package/openjpeg: security bump to version 2.4.0
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Drop upstreamed patches
- Update indentation in hash file (two spaces)
- Fix CVE-2020-27814, CVE-2020-27823, CVE-2020-27824 and CVE-2020-27841 to CVE-2020-27845https://github.com/uclouvain/openjpeg/releases/v2.4.0
Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/openjpeg: security bump to version 2.4.0
In reply to Fabrice FontaineQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Drop upstreamed patches
- Update indentation in hash file (two spaces)
- Fix CVE-2020-27814, CVE-2020-27823, CVE-2020-27824 and CVE-2020-27841 to CVE-2020-27845https://github.com/uclouvain/openjpeg/releases/v2.4.0
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard