diff options
| author | jeff <jhatch@multitech.com> | 2023-01-24 09:37:57 -0600 |
|---|---|---|
| committer | jeff <jhatch@multitech.com> | 2023-01-24 09:37:57 -0600 |
| commit | c94c9986362ebf4084734a3963415c5d894cf3a6 (patch) | |
| tree | 1f5d79df115e23318d93bfc9e99dddecf9be8748 /recipes-core/libxml/libxml2/CVE-2020-7595.patch | |
| parent | 8400520cffdd3c133c684eac60ab438a7ecaa050 (diff) | |
| parent | 2eaa3fd064097eb221b56d5df0e7136ba705a0cd (diff) | |
| download | meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.tar.gz meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.tar.bz2 meta-mlinux-c94c9986362ebf4084734a3963415c5d894cf3a6.zip | |
Merge branch 'md/cve-fixes2-squashed' into 6
Diffstat (limited to 'recipes-core/libxml/libxml2/CVE-2020-7595.patch')
| -rw-r--r-- | recipes-core/libxml/libxml2/CVE-2020-7595.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file mode 100644 index 0000000..facfefd --- /dev/null +++ b/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@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@huawei.com> + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] +CVE: CVE-2020-7595 +Signed-off-by: Anuj Mittal <anuj.mittal@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 + |