diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-02-05 11:54:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-02-05 13:04:03 +0100 |
| commit | 61851c5e9528fc803ee3dff5431d76482e125ba3 (patch) | |
| tree | f362a0cbc47e2139598a5f7bb8a66b52e79b441d /main/openjpeg/CVE-2020-6851.patch | |
| parent | c2dfa69c0483e7ee2210489a9c754c440b6e2bb2 (diff) | |
main/openjpeg: secfixes (CVE-2020-6851,CVE-2020-8112)
fixes #11189
(cherry picked from commit a60544e51180dade6c8e710f1bfd7060618ede11)
Diffstat (limited to 'main/openjpeg/CVE-2020-6851.patch')
| -rw-r--r-- | main/openjpeg/CVE-2020-6851.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/main/openjpeg/CVE-2020-6851.patch b/main/openjpeg/CVE-2020-6851.patch new file mode 100644 index 00000000000..9a70291f50e --- /dev/null +++ b/main/openjpeg/CVE-2020-6851.patch @@ -0,0 +1,29 @@ +From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +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 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); |