guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: Revert "gnu: libxslt: Update to 1.1.29."


From: Leo Famulari
Subject: 02/02: Revert "gnu: libxslt: Update to 1.1.29."
Date: Mon, 13 Jun 2016 16:16:14 +0000 (UTC)

lfam pushed a commit to branch core-updates-next
in repository guix.

commit 659494ef1809ecc7492ccb3d83a852c9632bc1e7
Author: Leo Famulari <address@hidden>
Date:   Mon Jun 13 12:15:42 2016 -0400

    Revert "gnu: libxslt: Update to 1.1.29."
    
    This reverts commit aee7f2e98ae2cbbd0cd765beda6c0a4279929c94.
    
    This commit has already been applied to another branch.
---
 gnu/local.mk                                     |    1 +
 gnu/packages/patches/libxslt-CVE-2015-7995.patch |   29 ++++++++++++++++++++++
 gnu/packages/xml.scm                             |    5 ++--
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 0beadfc..c130901 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -606,6 +606,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch        \
   gnu/packages/patches/libwmf-CVE-2015-4695.patch              \
   gnu/packages/patches/libwmf-CVE-2015-4696.patch              \
+  gnu/packages/patches/libxslt-CVE-2015-7995.patch             \
   gnu/packages/patches/lirc-localstatedir.patch                        \
   gnu/packages/patches/libpthread-glibc-preparation.patch      \
   gnu/packages/patches/lm-sensors-hwmon-attrs.patch            \
diff --git a/gnu/packages/patches/libxslt-CVE-2015-7995.patch 
b/gnu/packages/patches/libxslt-CVE-2015-7995.patch
new file mode 100644
index 0000000..f291d5b
--- /dev/null
+++ b/gnu/packages/patches/libxslt-CVE-2015-7995.patch
@@ -0,0 +1,29 @@
+From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <address@hidden>
+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.6.3
+
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 5ae14d5..9eaf71a 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -135,14 +135,15 @@ project (but it is usable outside of the Gnome 
platform).")
 (define-public libxslt
   (package
     (name "libxslt")
-    (version "1.1.29")
+    (version "1.1.28")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-";
                                  version ".tar.gz"))
              (sha256
               (base32
-               "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"))))
+               "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz"))
+             (patches (search-patches "libxslt-CVE-2015-7995.patch"))))
     (build-system gnu-build-system)
     (home-page "http://xmlsoft.org/XSLT/index.html";)
     (synopsis "C library for applying XSLT stylesheets to XML documents")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]