libxml2: security bump to version 2.9.3
PATCH 1/1 libxml2: security bump to version 2.9.3
- Fixes:
- CVE-2015-5312 - Another entity expansion issue
- CVE-2015-7497 - Avoid an heap buffer overflow in xmlDictComputeFastQKey
- CVE-2015-7500 - Fix memory access error due to incorrect entities boundaries
- CVE-2015-8242 - Buffer overead with HTML parser in push mode
- Incorporates upstreamed patches as well, which also fixed:
- CVE-2015-1819 - The xmlreader in libxml allows remote attackers to cause a denial of service (memory consumption) via crafted XML data, related to an XML Entity Expansion (XEE) attack.
- CVE-2015-7941 - out-of-bounds memory access.
- CVE-2015-7942 - heap-buffer-overflow in xmlParseConditionalSections.
- CVE-2015-8035 - DoS via crafted xz file.
--- ...onfig.cmake.in-update-include-directories.patch | 28 ---- ...s-use-forward-declarations-only-for-glibc.patch | 52 ------ package/libxml2/0003-fix-CVE-2015-1819.patch | 178 --------------------- package/libxml2/0004-fix-CVE-2015-7941-1.patch | 34 ---- package/libxml2/0005-fix-CVE-2015-7941-2.patch | 51 ------ package/libxml2/0006-fix-CVE-2015-7942-1.patch | 34 ---- package/libxml2/0007-fix-CVE-2015-7942-2.patch | 30 ---- package/libxml2/0008-fix-CVE-2015-8035.patch | 33 ---- package/libxml2/libxml2.hash | 2 +- package/libxml2/libxml2.mk | 2 +- 10 files changed, 2 insertions(+), 442 deletions(-) delete mode 100644 package/libxml2/0001-libxml2-config.cmake.in-update-include-directories.patch delete mode 100644 package/libxml2/0002-threads-use-forward-declarations-only-for-glibc.patch delete mode 100644 package/libxml2/0003-fix-CVE-2015-1819.patch delete mode 100644 package/libxml2/0004-fix-CVE-2015-7941-1.patch delete mode 100644 package/libxml2/0005-fix-CVE-2015-7941-2.patch delete mode 100644 package/libxml2/0006-fix-CVE-2015-7942-1.patch delete mode 100644 package/libxml2/0007-fix-CVE-2015-7942-2.patch delete mode 100644 package/libxml2/0008-fix-CVE-2015-8035.patch
package/libxml2/0001-libxml2-config.cmake.in-update-include-directories.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From dd6125f4b58fe7bc270e51bc3fcf41cd228d22fc Mon Sep 17 00:00:00 2001 -From: Samuel Martin <[email protected]> -Date: Mon, 29 Dec 2014 20:40:18 +0100 -Subject: [PATCH] libxml2-config.cmake.in: update include directories - -Align the include directories on those from the pkg-config module. - -Signed-off-by: Samuel Martin <[email protected]> ---- - libxml2-config.cmake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in -index ac29329..6b16fc2 100644 ---- a/libxml2-config.cmake.in -+++ b/libxml2-config.cmake.in -@@ -21,7 +21,7 @@ set(LIBXML2_VERSION_MINOR @LIBXML_MINOR_VERSION@) - set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@) - set(LIBXML2_VERSION_STRING "@VERSION@") - set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir}) --set(LIBXML2_INCLUDE_DIRS ${_libxml2_rootdir}/include) -+set(LIBXML2_INCLUDE_DIRS ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2) - set(LIBXML2_LIBRARY_DIR ${_libxml2_rootdir}/lib) - set(LIBXML2_LIBRARIES -L${LIBXML2_LIBRARY_DIR} -lxml2) - --- -2.2.1 -
package/libxml2/0002-threads-use-forward-declarations-only-for-glibc.patch deleted +0 -52
52 lines not on this page · raw message
package/libxml2/0003-fix-CVE-2015-1819.patch deleted +0 -178
178 lines not on this page · raw message
package/libxml2/0004-fix-CVE-2015-7941-1.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From a7dfab7411cbf545f359dd3157e5df1eb0e7ce31 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <[email protected]> -Date: Mon, 23 Feb 2015 11:17:35 +0800 -Subject: Stop parsing on entities boundaries errors - -For https://bugzilla.gnome.org/show_bug.cgi?id=744980 - -There are times, like on unterminated entities that it's preferable to -stop parsing, even if that means less error reporting. Entities are -feeding the parser on further processing, and if they are ill defined -then it's possible to get the parser to bug. Also do the same on -Conditional Sections if the input is broken, as the structure of -the document can't be guessed. - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - parser.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/parser.c b/parser.c -index a8d1b67..bbe97eb 100644 ---- a/parser.c -+++ b/parser.c -@@ -5658,6 +5658,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) { - if (RAW != '>') { - xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_NOT_FINISHED, - "xmlParseEntityDecl: entity %s not terminated\n", name); -+ xmlStopParser(ctxt); - } else { - if (input != ctxt->input) { - xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, --- -cgit v0.11.2 -
package/libxml2/0005-fix-CVE-2015-7941-2.patch deleted +0 -51
51 lines not on this page · raw message
package/libxml2/0006-fix-CVE-2015-7942-1.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From bd0526e66a56e75a18da8c15c4750db8f801c52d Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <[email protected]> -Date: Fri, 23 Oct 2015 19:02:28 +0800 -Subject: Another variation of overflow in Conditional sections - -Which happen after the previous fix to -https://bugzilla.gnome.org/show_bug.cgi?id=756456 - -But stopping the parser and exiting we didn't pop the intermediary entities -and doing the SKIP there applies on an input which may be too small - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - parser.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index a65e4cc..b9217ff 100644 ---- a/parser.c -+++ b/parser.c -@@ -6915,7 +6915,9 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { - "All markup of the conditional section is not in the same entity\n", - NULL, NULL); - } -- SKIP(3); -+ if ((ctxt-> instate != XML_PARSER_EOF) && -+ ((ctxt->input->cur + 3) < ctxt->input->end)) -+ SKIP(3); - } - } - --- -cgit v0.11.2 -
package/libxml2/0007-fix-CVE-2015-7942-2.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 41ac9049a27f52e7a1f3b341f8714149fc88d450 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <[email protected]> -Date: Tue, 27 Oct 2015 10:53:44 +0800 -Subject: Fix an error in previous Conditional section patch - -an off by one mistake in the change, led to error on correct -document where the end of the included entity was exactly -the end of the conditional section, leading to regtest failure - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index b9217ff..d67b300 100644 ---- a/parser.c -+++ b/parser.c -@@ -6916,7 +6916,7 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { - NULL, NULL); - } - if ((ctxt-> instate != XML_PARSER_EOF) && -- ((ctxt->input->cur + 3) < ctxt->input->end)) -+ ((ctxt->input->cur + 3) <= ctxt->input->end)) - SKIP(3); - } - } --- -cgit v0.11.2 -
package/libxml2/0008-fix-CVE-2015-8035.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <[email protected]> -Date: Tue, 3 Nov 2015 15:31:25 +0800 -Subject: CVE-2015-8035 Fix XZ compression support loop - -For https://bugzilla.gnome.org/show_bug.cgi?id=757466 -DoS when parsing specially crafted XML document if XZ support -is compiled in (which wasn't the case for 2.9.2 and master since -Nov 2013, fixed in next commit !) - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - xzlib.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xzlib.c b/xzlib.c -index 0dcb9f4..1fab546 100644 ---- a/xzlib.c -+++ b/xzlib.c -@@ -581,6 +581,10 @@ xz_decomp(xz_statep state) - xz_error(state, LZMA_DATA_ERROR, "compressed data error"); - return -1; - } -+ if (ret == LZMA_PROG_ERROR) { -+ xz_error(state, LZMA_PROG_ERROR, "compression error"); -+ return -1; -+ } - } while (strm->avail_out && ret != LZMA_STREAM_END); - - /* update available output and crc check value */ --- -cgit v0.11.2 -
package/libxml2/libxml2.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc libxml2-2.9.2.tar.gz +sha256 4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d libxml2-2.9.3.tar.gz
package/libxml2/libxml2.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.2 +LIBXML2_VERSION = 2.9.3 LIBXML2_SITE = ftp://xmlsoft.org/libxml2 LIBXML2_INSTALL_STAGING = YES LIBXML2_AUTORECONF = YES
Signature · 1 line
1.9.1
Thomas Petazzoni
AppliedPATCH 1/1 libxml2: security bump to version 2.9.3
Dear Danomi Manchego,
Quoted 27 lines · Danomi Manchego
- Fixes:
- CVE-2015-5312 - Another entity expansion issue
- CVE-2015-7497 - Avoid an heap buffer overflow in xmlDictComputeFastQKey
- CVE-2015-7500 - Fix memory access error due to incorrect entities boundaries
- CVE-2015-8242 - Buffer overead with HTML parser in push mode- Incorporates upstreamed patches as well, which also fixed:
- CVE-2015-1819 - The xmlreader in libxml allows remote attackers to cause a denial of service (memory consumption) via crafted XML data, related to an XML Entity Expansion (XEE) attack.
- CVE-2015-7941 - out-of-bounds memory access.
- CVE-2015-7942 - heap-buffer-overflow in xmlParseConditionalSections.
- CVE-2015-8035 - DoS via crafted xz file.Signed-off-by Danomi Manchego <[email protected]>--- ...onfig.cmake.in-update-include-directories.patch | 28 ---- ...s-use-forward-declarations-only-for-glibc.patch | 52 ------ package/libxml2/0003-fix-CVE-2015-1819.patch | 178 --------------------- package/libxml2/0004-fix-CVE-2015-7941-1.patch | 34 ---- package/libxml2/0005-fix-CVE-2015-7941-2.patch | 51 ------ package/libxml2/0006-fix-CVE-2015-7942-1.patch | 34 ---- package/libxml2/0007-fix-CVE-2015-7942-2.patch | 30 ---- package/libxml2/0008-fix-CVE-2015-8035.patch | 33 ---- package/libxml2/libxml2.hash | 2 +- package/libxml2/libxml2.mk | 2 +- 10 files changed, 2 insertions(+), 442 deletions(-)
Quoted 8 lines
delete mode 100644 package/libxml2/0001-libxml2-config.cmake.in-update-include-directories.patch delete mode 100644 package/libxml2/0002-threads-use-forward-declarations-only-for-glibc.patch delete mode 100644 package/libxml2/0003-fix-CVE-2015-1819.patch delete mode 100644 package/libxml2/0004-fix-CVE-2015-7941-1.patch delete mode 100644 package/libxml2/0005-fix-CVE-2015-7941-2.patch delete mode 100644 package/libxml2/0006-fix-CVE-2015-7942-1.patch delete mode 100644 package/libxml2/0007-fix-CVE-2015-7942-2.patch delete mode 100644 package/libxml2/0008-fix-CVE-2015-8035.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com