summaryrefslogtreecommitdiff
path: root/user/openjpeg/CVE-2020-6851.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-03-02 18:29:06 -0600
committerMax Rees <maxcrees@me.com>2020-03-09 21:27:44 -0500
commite57fee0540a6a586ccd7c66fedc94752a7f06b59 (patch)
tree7a98321a25a3790f7e353eec60bfd384b22c8b18 /user/openjpeg/CVE-2020-6851.patch
parent966502dcaa571ab5ff71343a4f297e2ab27693a4 (diff)
downloadpackages-e57fee0540a6a586ccd7c66fedc94752a7f06b59.tar.gz
packages-e57fee0540a6a586ccd7c66fedc94752a7f06b59.tar.bz2
packages-e57fee0540a6a586ccd7c66fedc94752a7f06b59.tar.xz
packages-e57fee0540a6a586ccd7c66fedc94752a7f06b59.zip
user/openjpeg: patch CVE-2020-6851 and CVE-2020-8112 (#235)
Diffstat (limited to 'user/openjpeg/CVE-2020-6851.patch')
-rw-r--r--user/openjpeg/CVE-2020-6851.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/user/openjpeg/CVE-2020-6851.patch b/user/openjpeg/CVE-2020-6851.patch
new file mode 100644
index 000000000..9a70291f5
--- /dev/null
+++ b/user/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);