[OE-core] [zeus][PATCH 1/2] libxml2: fix CVE-2020-7595

[akuster808]

On 2/21/20 1:00 PM, Adrian Bunk wrote:
> From: Anuj Mittal <anuj.mittal at intel.com>
>
> Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> Signed-off-by: Adrian Bunk <bunk at stusta.de>

Is this a backport from Master? please include masters commit id.

Since Master and Zeus are at different versions, was there anything you
had to do to make this apply to Zeus?

I have adopted the kernel stable note of [Fixup for XXX context] so the
folks know things had to be tweaked from the original commit.

- Armin


> ---
>  .../libxml/libxml2/CVE-2020-7595.patch        | 36 +++++++++++++++++++
>  meta/recipes-core/libxml/libxml2_2.9.9.bb     |  1 +
>  2 files changed, 37 insertions(+)
>  create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch
>
> diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch
> new file mode 100644
> index 0000000000..facfefd362
> --- /dev/null
> +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch
> @@ -0,0 +1,36 @@
> +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
> +From: Zhipeng Xie <xiezhipeng1 at huawei.com>
> +Date: Thu, 12 Dec 2019 17:30:55 +0800
> +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
> +
> +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
> +return NULL which cause a infinite loop in xmlStringLenDecodeEntities
> +
> +Found with libFuzzer.
> +
> +Signed-off-by: Zhipeng Xie <xiezhipeng1 at huawei.com>
> +
> +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076]
> +CVE: CVE-2020-7595
> +Signed-off-by: Anuj Mittal <anuj.mittal at intel.com> 
> +---
> + parser.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/parser.c b/parser.c
> +index d1c31963..a34bb6cd 100644
> +--- a/parser.c
> ++++ b/parser.c
> +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
> +     else
> +         c = 0;
> +     while ((c != 0) && (c != end) && /* non input consuming loop */
> +-	   (c != end2) && (c != end3)) {
> ++           (c != end2) && (c != end3) &&
> ++           (ctxt->instate != XML_PARSER_EOF)) {
> + 
> + 	if (c == 0) break;
> +         if ((c == '&') && (str[1] == '#')) {
> +-- 
> +2.24.1
> +
> diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb
> index c44a90b1c2..5797dd6bee 100644
> --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb
> +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb
> @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
>             file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
>             file://fix-execution-of-ptests.patch \
>             file://Fix-CVE-2019-19956.patch \
> +           file://CVE-2020-7595.patch \
>             "
>  
>  SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6"