[meta-oe][PATCH v2] openjpeg: Fix CVE-2020-6851

[meta-oe][PATCH v2] openjpeg: Fix CVE-2020-6851

[Sakib Sajal]

From: Yue Tao <Yue.Tao@windriver.com>

Backport patch from upstream to fix heap-based buffer overflow

Upstream-Status: Backport
CVE: CVE-2020-6851

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Sakib Sajal <Sakib.Sajal@windriver.com>
---
 .../openjpeg/openjpeg/CVE-2020-6851.patch     | 32 +++++++++++++++++++
 .../openjpeg/openjpeg_2.3.1.bb                |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch

diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
new file mode 100644
index 000000000..9f2fc901f
--- /dev/null
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
@@ -0,0 +1,32 @@
+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 14f6ff41..922550eb 100644
+--- a/src/lib/openjp2/j2k.c
++++ b/src/lib/openjp2/j2k.c
+@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
+     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.17.1
+
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
index ffd4099b4..4045148dd 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
@@ -8,6 +8,7 @@ DEPENDS = "libpng tiff lcms zlib"
 SRC_URI = " \
     git://github.com/uclouvain/openjpeg.git \
     file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
+    file://CVE-2020-6851.patch \
 "
 SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788"
 S = "${WORKDIR}/git"
-- 
2.17.1

Re: [meta-oe][PATCH v2] openjpeg: Fix CVE-2020-6851

[akuster808]

On 3/11/20 12:11 PM, Sakib Sajal wrote:
> From: Yue Tao <Yue.Tao@windriver.com>
>
> Backport patch from upstream to fix heap-based buffer overflow
>
> Upstream-Status: Backport
> CVE: CVE-2020-6851

Applies to Zeus too.


>
> Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
> Signed-off-by: Sakib Sajal <Sakib.Sajal@windriver.com>
> ---
>  .../openjpeg/openjpeg/CVE-2020-6851.patch     | 32 +++++++++++++++++++
>  .../openjpeg/openjpeg_2.3.1.bb                |  1 +
>  2 files changed, 33 insertions(+)
>  create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
>
> diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
> new file mode 100644
> index 000000000..9f2fc901f
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch
> @@ -0,0 +1,32 @@
> +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 14f6ff41..922550eb 100644
> +--- a/src/lib/openjp2/j2k.c
> ++++ b/src/lib/openjp2/j2k.c
> +@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
> +     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.17.1
> +
> diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
> index ffd4099b4..4045148dd 100644
> --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
> @@ -8,6 +8,7 @@ DEPENDS = "libpng tiff lcms zlib"
>  SRC_URI = " \
>      git://github.com/uclouvain/openjpeg.git \
>      file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
> +    file://CVE-2020-6851.patch \
>  "
>  SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788"
>  S = "${WORKDIR}/git"