diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-11-20 13:53:43 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-03-03 19:35:30 +0100 |
commit | 6017be47f48c4808b7b74164e1fc290d1a9ed462 (patch) | |
tree | 2480f97d294545cfad256695b88cb3b8f77641b6 | |
parent | 6e8a825701c6c8abeb05b836349ba14132f18cd9 (diff) |
libxslt: add patch for CVE-2015-7995
(cherry picked from commit 45d1abeff9d4041b3e174f0eddd10bfd6ab8a360)
Reviewed-on: https://gerrit.libreoffice.org/20097
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 17c513b7fca9304b635a57d11de77d7eccf7188a)
(cherry picked from commit 5cf00b458326204819332be4424acca16514a8c6)
Change-Id: I733cd21f6d8c7ea1e01f594d1483ad9c2043c188
-rw-r--r-- | external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 | 29 | ||||
-rw-r--r-- | external/libxslt/UnpackedTarball_xslt.mk | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 b/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 new file mode 100644 index 000000000000..4f87e798fb57 --- /dev/null +++ b/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 @@ -0,0 +1,29 @@ +From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 29 Oct 2015 19:33:23 +0800 +Subject: [PATCH] Fix for type confusion in preprocessing attributes + +CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10 +We need to check that the parent node is an element before dereferencing +its namespace +--- + libxslt/preproc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libxslt/preproc.c b/libxslt/preproc.c +index 0eb80a0..7f69325 100644 +--- a/libxslt/preproc.c ++++ b/libxslt/preproc.c +@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) { + } else if (IS_XSLT_NAME(inst, "attribute")) { + xmlNodePtr parent = inst->parent; + +- if ((parent == NULL) || (parent->ns == NULL) || ++ if ((parent == NULL) || ++ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || + ((parent->ns != inst->ns) && + (!xmlStrEqual(parent->ns->href, inst->ns->href))) || + (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { +-- +2.4.3 + diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk index fd4212e366bb..e244ebcdfba4 100644 --- a/external/libxslt/UnpackedTarball_xslt.mk +++ b/external/libxslt/UnpackedTarball_xslt.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\ external/libxslt/libxslt-vc10.patch \ external/libxslt/libxslt-1.1.26-memdump.patch \ $(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \ + external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 \ )) # vim: set noet sw=4 ts=4: |