diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2015-11-20 20:42:02 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2015-11-20 20:42:02 +0000 |
| commit | dc7551db2998381590c3d95092cee810ee003397 (patch) | |
| tree | fb90b8e9b2e6dac98b36f4540be05b40ba2db87d /textproc/libxslt | |
| parent | Document libxslt: (diff) | |
Fix CVE-2015-7995
Obtained from: libxslt upstream
MFH: 2015Q4
Security: ecc268f2-8fc2-11e5-918c-bcaec565249c
Notes
Notes:
svn path=/head/; revision=402101
Diffstat (limited to 'textproc/libxslt')
| -rw-r--r-- | textproc/libxslt/Makefile | 2 | ||||
| -rw-r--r-- | textproc/libxslt/files/patch-CVE-2015-7995 | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index e1960d733f52..e492f9ba1826 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -3,7 +3,7 @@ PORTNAME= libxslt PORTVERSION= 1.1.28 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ diff --git a/textproc/libxslt/files/patch-CVE-2015-7995 b/textproc/libxslt/files/patch-CVE-2015-7995 new file mode 100644 index 000000000000..9e83afc98b02 --- /dev/null +++ b/textproc/libxslt/files/patch-CVE-2015-7995 @@ -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: 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 +--- libxslt/preproc.c ++++ 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"))) { +-- +cgit v0.11.2 + |