From a23bfc9774201c5eeb6c2d981439d3202cb9c1df Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 26 Nov 2019 00:10:22 +0100 Subject: libxml2: update to 2.9.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Heimpold (cherry picked from commit 10e867d0261a0e7d6a94a672104e7f25ae884eff) [remove no longer needed CVE-2019-19956 patch (fixed in libxml2 2.9.10)] Signed-off-by: Šimon Bořek --- libs/libxml2/Makefile | 6 +++--- libs/libxml2/patches/CVE-2019-19956.patch | 33 ------------------------------- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 libs/libxml2/patches/CVE-2019-19956.patch diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index ee9dfbefd..fb23685a2 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 -PKG_VERSION:=2.9.9 -PKG_RELEASE:=3 +PKG_VERSION:=2.9.10 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://xmlsoft.org/sources/ -PKG_HASH:=94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 +PKG_HASH:=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/libs/libxml2/patches/CVE-2019-19956.patch b/libs/libxml2/patches/CVE-2019-19956.patch deleted file mode 100644 index bafc9a62a..000000000 --- a/libs/libxml2/patches/CVE-2019-19956.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5a02583c7e683896d84878bd90641d8d9b0d0549 Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -Date: Wed, 7 Aug 2019 17:39:17 +0800 -Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover - -When doc is NULL, namespace created in xmlTreeEnsureXMLDecl -is bind to newDoc->oldNs, in this case, set newDoc->oldNs to -NULL and free newDoc will cause a memory leak. - -Found with libFuzzer. - -Closes #82. ---- - parser.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index 1ce1ccf14..26d9f4e3b 100644 ---- a/parser.c -+++ b/parser.c -@@ -13894,7 +13894,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, - xmlFreeParserCtxt(ctxt); - newDoc->intSubset = NULL; - newDoc->extSubset = NULL; -- newDoc->oldNs = NULL; -+ if(doc != NULL) -+ newDoc->oldNs = NULL; - xmlFreeDoc(newDoc); - - return(ret); --- -GitLab - -- cgit From a3557e5362c75584bf1702bbaef469055b64aa39 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Wed, 19 May 2021 00:12:32 +0200 Subject: libxml2: update to 2.9.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Heimpold (cherry picked from commit 6b932d3ff77c63fe01080139c147c86da12f0c88) Signed-off-by: Šimon Bořek --- libs/libxml2/Makefile | 4 ++-- libs/libxml2/patches/CVE-2019-20388.patch | 33 ---------------------------- libs/libxml2/patches/CVE-2020-24977.patch | 36 ------------------------------- libs/libxml2/patches/CVE-2020-7595.patch | 32 --------------------------- 4 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 libs/libxml2/patches/CVE-2019-20388.patch delete mode 100644 libs/libxml2/patches/CVE-2020-24977.patch delete mode 100644 libs/libxml2/patches/CVE-2020-7595.patch diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index fb23685a2..15fc84f43 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 -PKG_VERSION:=2.9.10 +PKG_VERSION:=2.9.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://xmlsoft.org/sources/ -PKG_HASH:=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f +PKG_HASH:=c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/libs/libxml2/patches/CVE-2019-20388.patch b/libs/libxml2/patches/CVE-2019-20388.patch deleted file mode 100644 index 653b5701d..000000000 --- a/libs/libxml2/patches/CVE-2019-20388.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6088a74bcf7d0c42e24cff4594d804e1d3c9fbca Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -Date: Tue, 20 Aug 2019 16:33:06 +0800 -Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream - -When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun -alloc a new schema for ctxt->schema and set vctxt->xsiAssemble -to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize -vctxt->xsiAssemble to 0 again which cause the alloced schema -can not be freed anymore. - -Found with libFuzzer. - -Signed-off-by: Zhipeng Xie ---- - xmlschemas.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/xmlschemas.c b/xmlschemas.c -index 301c84499..39d92182f 100644 ---- a/xmlschemas.c -+++ b/xmlschemas.c -@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { - vctxt->nberrors = 0; - vctxt->depth = -1; - vctxt->skipDepth = -1; -- vctxt->xsiAssemble = 0; - vctxt->hasKeyrefs = 0; - #ifdef ENABLE_IDC_NODE_TABLES_TEST - vctxt->createIDCNodeTables = 1; --- -GitLab - diff --git a/libs/libxml2/patches/CVE-2020-24977.patch b/libs/libxml2/patches/CVE-2020-24977.patch deleted file mode 100644 index fe4b39800..000000000 --- a/libs/libxml2/patches/CVE-2020-24977.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 7 Aug 2020 21:54:27 +0200 -Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout' - -Make sure that truncated UTF-8 sequences don't cause an out-of-bounds -array access. - -Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for -the report. - -Fixes #178. ---- - xmllint.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xmllint.c b/xmllint.c -index f6a8e4636..c647486f3 100644 ---- a/xmllint.c -+++ b/xmllint.c -@@ -528,6 +528,12 @@ static void - xmlHTMLEncodeSend(void) { - char *result; - -+ /* -+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might -+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid -+ * an out-of-bounds read. -+ */ -+ memset(&buffer[sizeof(buffer)-4], 0, 4); - result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); - if (result) { - xmlGenericError(xmlGenericErrorContext, "%s", result); --- -GitLab - diff --git a/libs/libxml2/patches/CVE-2020-7595.patch b/libs/libxml2/patches/CVE-2020-7595.patch deleted file mode 100644 index 4f12bff9f..000000000 --- a/libs/libxml2/patches/CVE-2020-7595.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -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 ---- - parser.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index d1c319631..a34bb6cdd 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] == '#')) { --- -GitLab - -- cgit From 0da04ff0b71038f85c35adbbf20ea130fd445f9e Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 15 Mar 2022 21:24:32 +0100 Subject: libxml2: update to 2.9.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes CVE-2022-23308. Also switch to GNOME as download source and xz tarball. Signed-off-by: Michael Heimpold (cherry picked from commit 81fd836f97aee93c8cfcb4ebbf901c2a99c3525c) Signed-off-by: Šimon Bořek --- libs/libxml2/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index 15fc84f43..bb6bee19b 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 -PKG_VERSION:=2.9.12 +PKG_VERSION:=2.9.13 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://xmlsoft.org/sources/ -PKG_HASH:=c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION)) +PKG_HASH:=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING -- cgit From 1ad2e67d4cae2a736704eead4165a0b367f6e569 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sun, 29 May 2022 22:01:45 +0200 Subject: libxml2: update to 2.9.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes CVE-2022-29824. Signed-off-by: Michael Heimpold (cherry picked from commit c12e1cfcab318d0a5b48d63d5952af418e62822e) Signed-off-by: Šimon Bořek --- libs/libxml2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index bb6bee19b..6b6e9baa1 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 -PKG_VERSION:=2.9.13 +PKG_VERSION:=2.9.14 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION)) -PKG_HASH:=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e +PKG_HASH:=60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING -- cgit