components/libxslt/patches/CVE-2015-7995.patch
author Ivo Raisr <ivo.raisr@oracle.com>
Fri, 25 Nov 2016 17:16:40 -0800
branchs11u3-sru
changeset 7453 688f73f0b72d
parent 5320 4ec6f72e88e0
permissions -rw-r--r--
PSARC/2016/232 CACkey Smartcard PKCS#11 provider 24657593 cackey needs to deliver 32-bit libraries
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5320
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
Patch origin: upstream
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
Patch status: will be part of next version
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
https://git.gnome.org/browse/libxslt/commit/?id=7ca19df892ca22d9314e95d59ce2abdeff46b617
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
From: Daniel Veillard <[email protected]>
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
Date: Thu, 29 Oct 2015 19:33:23 +0800
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
Subject: Fix for type confusion in preprocessing attributes
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
We need to check that the parent node is an element before dereferencing
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
its namespace
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
---
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
 libxslt/preproc.c | 3 ++-
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
 1 file changed, 2 insertions(+), 1 deletion(-)
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
diff --git a/libxslt/preproc.c b/libxslt/preproc.c
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
index 0eb80a0..7f69325 100644
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
--- a/libxslt/preproc.c
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
+++ b/libxslt/preproc.c
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    23
 	} else if (IS_XSLT_NAME(inst, "attribute")) {
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
 	    xmlNodePtr parent = inst->parent;
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
 
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
-	    if ((parent == NULL) || (parent->ns == NULL) ||
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    27
+	    if ((parent == NULL) ||
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    28
+	        (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
 		((parent->ns != inst->ns) &&
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    30
 		 (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
 		(!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
-- 
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
cgit v0.11.2
4ec6f72e88e0 22134245 problem in LIBRARY/LIBXSLT
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34