[OE-core] [sumo] [PATCH v1 2/2] libcroco: CVE-2017-7961

[akuster808]

On 09/25/2018 10:18 AM, Sinan Kaya wrote:
> * CVE-2017-7961
> The cr_tknzr_parse_rgb function in cr-tknzr.c in libcroco has an
> "outside the range of representable values of type long" undefined
> behavior issue, which might allow remote attackers to cause a denial
> of service (application crash) or possibly have unspecified other
> impact via a crafted CSS file.
>
> CVE: CVE-2017-7961
> Ref: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-7961
> Signed-off-by: Sinan Kaya <okaya at kernel.org>
> ---
>  .../libcroco/libcroco/CVE-2017-7961.patch     | 45 +++++++++++++++++++
>  .../libcroco/libcroco_0.6.12.bb               |  2 +
>  2 files changed, 47 insertions(+)
>  create mode 100644 meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch
>
> diff --git a/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch b/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch
> new file mode 100644
> index 0000000000..d407eca6d8
> --- /dev/null
> +++ b/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch
> @@ -0,0 +1,45 @@
> +From 5fa3165613b77b516e2b0dc128f73b673bd3ec8b Mon Sep 17 00:00:00 2001
> +From: Ignacio Casal Quinteiro <qignacio at amazon.com>
> +Date: Sun, 16 Apr 2017 13:56:09 +0200
> +Subject: [PATCH] tknzr: support only max long rgb values
> +
> +This fixes a possible out of bound when reading rgbs which
> +are longer than the support MAXLONG
> +
> +Upstream-Status: Backport [https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7]
Please add;
CVE: CVE-2017-7961
> +Signed-off-by: Sinan Kaya <okaya at kernel.org>
> +---
> + src/cr-tknzr.c | 10 ++++++++++
> + 1 file changed, 10 insertions(+)
> +
> +diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c
> +index e3af0ee..76886ec 100644
> +--- a/src/cr-tknzr.c
> ++++ b/src/cr-tknzr.c
> +@@ -1280,6 +1280,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
> +         status = cr_tknzr_parse_num (a_this, &num);
> +         ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
> + 
> ++        if (num->val > G_MAXLONG) {
> ++                status = CR_PARSING_ERROR;
> ++                goto error;
> ++        }
> ++
> +         red = num->val;
> +         cr_num_destroy (num);
> +         num = NULL;
> +@@ -1299,6 +1304,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
> +                 status = cr_tknzr_parse_num (a_this, &num);
> +                 ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
> + 
> ++                if (num->val > G_MAXLONG) {
> ++                        status = CR_PARSING_ERROR;
> ++                        goto error;
> ++                }
> ++
> +                 PEEK_BYTE (a_this, 1, &next_bytes[0]);
> +                 if (next_bytes[0] == '%') {
> +                         SKIP_CHARS (a_this, 1);
> +-- 
> +2.19.0
> +
> diff --git a/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/meta/recipes-support/libcroco/libcroco_0.6.12.bb
> index d86ddd6464..dd7dad424c 100644
> --- a/meta/recipes-support/libcroco/libcroco_0.6.12.bb
> +++ b/meta/recipes-support/libcroco/libcroco_0.6.12.bb
> @@ -16,5 +16,7 @@ BINCONFIG = "${bindir}/croco-0.6-config"
>  
>  inherit gnomebase gtk-doc binconfig-disabled
>  
> +SRC_URI += "file://CVE-2017-7961.patch"
> +
>  SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce"
>  SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860"