diff options
| author | Mykola Salomatin <mykola.salomatin@globallogic.com> | 2023-01-26 19:30:38 +0200 |
|---|---|---|
| committer | Mykola Salomatin <mykola.salomatin@globallogic.com> | 2023-01-26 19:30:38 +0200 |
| commit | 8b2c5033c01df17ce1bed9489570a5e56e3be862 (patch) | |
| tree | 8a7abda338d1c144e904cd54e6ab99322119969e /recipes-core/libxml/libxml2/CVE-2021-3537.patch | |
| parent | e77d906d6f9d0da38ab5faff8b2a11a4383650de (diff) | |
| parent | 755c00a4dfc34c95640e832ca8cafb71a7d356aa (diff) | |
| download | meta-mlinux-8b2c5033c01df17ce1bed9489570a5e56e3be862.tar.gz meta-mlinux-8b2c5033c01df17ce1bed9489570a5e56e3be862.tar.bz2 meta-mlinux-8b2c5033c01df17ce1bed9489570a5e56e3be862.zip | |
Merge branch '6' into mpower-dev-l6g1
Diffstat (limited to 'recipes-core/libxml/libxml2/CVE-2021-3537.patch')
| -rw-r--r-- | recipes-core/libxml/libxml2/CVE-2021-3537.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/recipes-core/libxml/libxml2/CVE-2021-3537.patch b/recipes-core/libxml/libxml2/CVE-2021-3537.patch new file mode 100644 index 0000000..9e64c2a --- /dev/null +++ b/recipes-core/libxml/libxml2/CVE-2021-3537.patch @@ -0,0 +1,50 @@ +From babe75030c7f64a37826bb3342317134568bef61 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Sat, 1 May 2021 16:53:33 +0200 +Subject: [PATCH] Propagate error in xmlParseElementChildrenContentDeclPriv + +Check return value of recursive calls to +xmlParseElementChildrenContentDeclPriv and return immediately in case +of errors. Otherwise, struct xmlElementContent could contain unexpected +null pointers, leading to a null deref when post-validating documents +which aren't well-formed and parsed in recovery mode. + +Fixes #243. + +Upstream-Status: Backport +[https://gitlab.gnome.org/GNOME/libxml2/-/commit/babe75030c7f64a37826bb3342317134568bef61] +CVE: CVE-2021-3537 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> + +--- + parser.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/parser.c b/parser.c +index b42e6043..73c27edd 100644 +--- a/parser.c ++++ b/parser.c +@@ -6208,6 +6208,8 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk, + SKIP_BLANKS; + cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); ++ if (cur == NULL) ++ return(NULL); + SKIP_BLANKS; + GROW; + } else { +@@ -6341,6 +6343,11 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk, + SKIP_BLANKS; + last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); ++ if (last == NULL) { ++ if (ret != NULL) ++ xmlFreeDocElementContent(ctxt->myDoc, ret); ++ return(NULL); ++ } + SKIP_BLANKS; + } else { + elem = xmlParseName(ctxt); +-- +GitLab + |