libxml2: bump to version 2.8.0

From 5bd3c061823a8499b27422aee04ea20aae24f03e Mon Sep 17 00:00:00 2001

From: Daniel Veillard <veillard@redhat.com>

Date: Fri, 16 Dec 2011 10:53:35 +0000

Subject: Fix an allocation error when copying entities

---

diff --git a/parser.c b/parser.c

index 4e5dcb9..c55e41d 100644

--- a/parser.c

+++ b/parser.c

@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,

 		buffer[nbchars++] = '&';

 		if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {

-		    growBuffer(buffer, XML_PARSER_BUFFER_SIZE);

+		    growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);

 		}

 		for (;i > 0;i--)

 		    buffer[nbchars++] = *cur++;

--

cgit v0.9.0.2

From d7958b21e7f8c447a26bb2436f08402b2c308be4 Mon Sep 17 00:00:00 2001

From: Chris Evans <scarybeasts@gmail.com>

Date: Wed, 23 Mar 2011 00:13:06 +0000

Subject: Fix some potential problems on reallocation failures

The count was incremented before the allocation

and not fixed in case of failure

* xpath.c: corrects a few instances where the available count of some

           structure is updated before we know the allocation actually

           succeeds

---

diff --git a/xpath.c b/xpath.c

index 8b56189..608fe00 100644

--- a/xpath.c

+++ b/xpath.c

@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) {

     } else if (cur->nodeNr == cur->nodeMax) {

         xmlNodePtr *temp;

-        cur->nodeMax *= 2;

-	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *

+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *

 				      sizeof(xmlNodePtr));

 	if (temp == NULL) {

 	    xmlXPathErrMemory(NULL, "growing nodeset\n");

 	    return;

 	}

+        cur->nodeMax *= 2;

 	cur->nodeTab = temp;

     }

     cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);

@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) {

     } else if (cur->nodeNr == cur->nodeMax) {

         xmlNodePtr *temp;

-        cur->nodeMax *= 2;

-	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *

+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *

 				      sizeof(xmlNodePtr));

 	if (temp == NULL) {

 	    xmlXPathErrMemory(NULL, "growing nodeset\n");

 	    return;

 	}

 	cur->nodeTab = temp;

+        cur->nodeMax *= 2;

     }

     if (val->type == XML_NAMESPACE_DECL) {

 	xmlNsPtr ns = (xmlNsPtr) val;

@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) {

 	} else if (val1->nodeNr == val1->nodeMax) {

 	    xmlNodePtr *temp;

-	    val1->nodeMax *= 2;

-	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *

+	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 *

 					     sizeof(xmlNodePtr));

 	    if (temp == NULL) {

 	        xmlXPathErrMemory(NULL, "merging nodeset\n");

 		return(NULL);

 	    }

 	    val1->nodeTab = temp;

+	    val1->nodeMax *= 2;

 	}

 	if (n2->type == XML_NAMESPACE_DECL) {

 	    xmlNsPtr ns = (xmlNsPtr) n2;

@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2,

 	    } else if (set1->nodeNr >= set1->nodeMax) {

 		xmlNodePtr *temp;

-		set1->nodeMax *= 2;

 		temp = (xmlNodePtr *) xmlRealloc(

-		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));

+		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));

 		if (temp == NULL) {

 		    xmlXPathErrMemory(NULL, "merging nodeset\n");

 		    return(NULL);

 		}

 		set1->nodeTab = temp;

+		set1->nodeMax *= 2;

 	    }

 	    if (n2->type == XML_NAMESPACE_DECL) {

 		xmlNsPtr ns = (xmlNsPtr) n2;

@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2,

 	    } else if (set1->nodeNr >= set1->nodeMax) {

 		xmlNodePtr *temp;

-		set1->nodeMax *= 2;

 		temp = (xmlNodePtr *) xmlRealloc(

-		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));

+		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));

 		if (temp == NULL) {

 		    xmlXPathErrMemory(NULL, "merging nodeset\n");

 		    return(NULL);

 		}

 		set1->nodeTab = temp;

+		set1->nodeMax *= 2;

 	    }

 	    set1->nodeTab[set1->nodeNr++] = n2;

 	}

--

cgit v0.9

From 8973d58b7498fa5100a876815476b81fd1a2412a Mon Sep 17 00:00:00 2001

From: Daniel Veillard <veillard@redhat.com>

Date: Sat, 4 Feb 2012 19:07:44 +0800

Subject: [PATCH] Add hash randomization to hash and dict structures

Following http://www.ocert.org/advisories/ocert-2011-003.html

it seems that having hash randomization might be a good idea

when using XML with untrusted data

* configure.in: lookup for rand, srand and time

* dict.c: add randomization to dictionaries hash tables

* hash.c: add randomization to normal hash tables

---

 configure.in |    1 +

 dict.c       |   81 ++++++++++++++++++++++++++++++++++++++++-----------------

 hash.c       |   38 ++++++++++++++++++++++++++-

 3 files changed, 95 insertions(+), 25 deletions(-)

diff --git a/configure.in b/configure.in

index fa80375..828b66a 100644

--- a/configure.in

+++ b/configure.in

@@ -512,6 +512,7 @@ AC_CHECK_FUNCS(strdup strndup strerror)

 AC_CHECK_FUNCS(finite isnand fp_class class fpclass)

 AC_CHECK_FUNCS(strftime localtime gettimeofday ftime)

 AC_CHECK_FUNCS(stat _stat signal)

+AC_CHECK_FUNCS(rand srand time)

 dnl Checking the standard string functions availability

 AC_CHECK_FUNCS(printf sprintf fprintf snprintf vfprintf vsprintf vsnprintf sscanf,,

diff --git a/dict.c b/dict.c

index 3eff231..ae4966b 100644

--- a/dict.c

+++ b/dict.c

@@ -2,7 +2,7 @@

  * dict.c: dictionary of reusable strings, just used to avoid allocation

  *         and freeing operations.

  *

- * Copyright (C) 2003 Daniel Veillard.

+ * Copyright (C) 2003-2012 Daniel Veillard.

  *

  * Permission to use, copy, modify, and distribute this software for any

  * purpose with or without fee is hereby granted, provided that the above

@@ -19,6 +19,28 @@

 #define IN_LIBXML

 #include "libxml.h"

+#ifdef HAVE_STDLIB_H

+#include <stdlib.h>

+#endif

+#ifdef HAVE_TIME_H

+#include <time.h>

+#endif

+

+/*

+ * Following http://www.ocert.org/advisories/ocert-2011-003.html

+ * it seems that having hash randomization might be a good idea

+ * when using XML with untrusted data

+ * Note1: that it works correctly only if compiled with WITH_BIG_KEY

+ *  which is the default.

+ * Note2: the fast function used for a small dict won't protect very

+ *  well but since the attack is based on growing a very big hash

+ *  list we will use the BigKey algo as soon as the hash size grows

+ *  over MIN_DICT_SIZE so this actually works

+ */

+#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME)

+#define DICT_RANDOMIZATION

+#endif

+

 #include <string.h>

 #ifdef HAVE_STDINT_H

 #include <stdint.h>

@@ -44,23 +66,23 @@ typedef unsigned __int32 uint32_t;

 #define WITH_BIG_KEY

 #ifdef WITH_BIG_KEY

-#define xmlDictComputeKey(dict, name, len)			\

-    (((dict)->size == MIN_DICT_SIZE) ?				\

-     xmlDictComputeFastKey(name, len) :				\

-     xmlDictComputeBigKey(name, len))

-

-#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\

-    (((prefix) == NULL) ?					\

-      (xmlDictComputeKey(dict, name, len)) :			\

-      (((dict)->size == MIN_DICT_SIZE) ?			\

-       xmlDictComputeFastQKey(prefix, plen, name, len) :	\

-       xmlDictComputeBigQKey(prefix, plen, name, len)))

+#define xmlDictComputeKey(dict, name, len)                              \

+    (((dict)->size == MIN_DICT_SIZE) ?                                  \

+     xmlDictComputeFastKey(name, len, (dict)->seed) :                   \

+     xmlDictComputeBigKey(name, len, (dict)->seed))

+

+#define xmlDictComputeQKey(dict, prefix, plen, name, len)               \

+    (((prefix) == NULL) ?                                               \

+      (xmlDictComputeKey(dict, name, len)) :                             \

+      (((dict)->size == MIN_DICT_SIZE) ?                                \

+       xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed) :	\

+       xmlDictComputeBigQKey(prefix, plen, name, len, (dict)->seed)))

 #else /* !WITH_BIG_KEY */

-#define xmlDictComputeKey(dict, name, len)			\

-        xmlDictComputeFastKey(name, len)

-#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\

-        xmlDictComputeFastQKey(prefix, plen, name, len)

+#define xmlDictComputeKey(dict, name, len)                              \

+        xmlDictComputeFastKey(name, len, (dict)->seed)

+#define xmlDictComputeQKey(dict, prefix, plen, name, len)               \

+        xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed)

 #endif /* WITH_BIG_KEY */

 /*

@@ -98,6 +120,8 @@ struct _xmlDict {

     xmlDictStringsPtr strings;

     struct _xmlDict *subdict;

+    /* used for randomization */

+    int seed;

 };

 /*

@@ -125,6 +149,9 @@ static int xmlInitializeDict(void) {

     if ((xmlDictMutex = xmlNewRMutex()) == NULL)

         return(0);

+#ifdef DICT_RANDOMIZATION

+    srand(time(NULL));

+#endif

     xmlDictInitialized = 1;

     return(1);

 }

@@ -277,13 +304,13 @@ found_pool:

  */

 static uint32_t

-xmlDictComputeBigKey(const xmlChar* data, int namelen) {

+xmlDictComputeBigKey(const xmlChar* data, int namelen, int seed) {

     uint32_t hash;

     int i;

     if (namelen <= 0 || data == NULL) return(0);

-    hash = 0;

+    hash = seed;

     for (i = 0;i < namelen; i++) {

         hash += data[i];

@@ -310,12 +337,12 @@ xmlDictComputeBigKey(const xmlChar* data, int namelen) {

  */

 static unsigned long

 xmlDictComputeBigQKey(const xmlChar *prefix, int plen,

-                      const xmlChar *name, int len)

+                      const xmlChar *name, int len, int seed)

 {

     uint32_t hash;

     int i;

-    hash = 0;

+    hash = seed;

     for (i = 0;i < plen; i++) {

         hash += prefix[i];

@@ -346,8 +373,8 @@ xmlDictComputeBigQKey(const xmlChar *prefix, int plen,

  * for low hash table fill.

  */

 static unsigned long

-xmlDictComputeFastKey(const xmlChar *name, int namelen) {

-    unsigned long value = 0L;

+xmlDictComputeFastKey(const xmlChar *name, int namelen, int seed) {

+    unsigned long value = seed;

     if (name == NULL) return(0);

     value = *name;

@@ -381,9 +408,9 @@ xmlDictComputeFastKey(const xmlChar *name, int namelen) {

  */

 static unsigned long

 xmlDictComputeFastQKey(const xmlChar *prefix, int plen,

-                       const xmlChar *name, int len)

+                       const xmlChar *name, int len, int seed)

 {

-    unsigned long value = 0L;

+    unsigned long value = (unsigned long) seed;

     if (plen == 0)

 	value += 30 * (unsigned long) ':';

@@ -460,6 +487,11 @@ xmlDictCreate(void) {

 	dict->subdict = NULL;

         if (dict->dict) {

 	    memset(dict->dict, 0, MIN_DICT_SIZE * sizeof(xmlDictEntry));

+#ifdef DICT_RANDOMIZATION

+            dict->seed = rand();

+#else

+            dict->seed = 0;

+#endif

 	    return(dict);

         }

         xmlFree(dict);

@@ -486,6 +518,7 @@ xmlDictCreateSub(xmlDictPtr sub) {

 #ifdef DICT_DEBUG_PATTERNS

         fprintf(stderr, "R");

 #endif

+        dict->seed = sub->seed;

         dict->subdict = sub;

 	xmlDictReference(dict->subdict);

     }

diff --git a/hash.c b/hash.c

index b78bc2d..fe1424f 100644

--- a/hash.c

+++ b/hash.c

@@ -3,7 +3,7 @@

  *

  * Reference: Your favorite introductory book on algorithms

  *

- * Copyright (C) 2000 Bjorn Reese and Daniel Veillard.

+ * Copyright (C) 2000,2012 Bjorn Reese and Daniel Veillard.

  *

  * Permission to use, copy, modify, and distribute this software for any

  * purpose with or without fee is hereby granted, provided that the above

@@ -21,6 +21,22 @@

 #include "libxml.h"

 #include <string.h>

+#ifdef HAVE_STDLIB_H

+#include <stdlib.h>

+#endif

+#ifdef HAVE_TIME_H

+#include <time.h>

+#endif

+

+/*

+ * Following http://www.ocert.org/advisories/ocert-2011-003.html

+ * it seems that having hash randomization might be a good idea

+ * when using XML with untrusted data

+ */

+#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME)

+#define HASH_RANDOMIZATION

+#endif

+

 #include <libxml/parser.h>

 #include <libxml/hash.h>

 #include <libxml/xmlmemory.h>

@@ -31,6 +47,10 @@

 /* #define DEBUG_GROW */

+#ifdef HASH_RANDOMIZATION

+static int hash_initialized = 0;

+#endif

+

 /*

  * A single entry in the hash table

  */

@@ -53,6 +73,9 @@ struct _xmlHashTable {

     int size;

     int nbElems;

     xmlDictPtr dict;

+#ifdef HASH_RANDOMIZATION

+    int random_seed;

+#endif

 };

 /*

@@ -65,6 +88,9 @@ xmlHashComputeKey(xmlHashTablePtr table, const xmlChar *name,

     unsigned long value = 0L;

     char ch;

+#ifdef HASH_RANDOMIZATION

+    value = table->random_seed;

+#endif

     if (name != NULL) {

 	value += 30 * (*name);

 	while ((ch = *name++) != 0) {

@@ -92,6 +118,9 @@ xmlHashComputeQKey(xmlHashTablePtr table,

     unsigned long value = 0L;

     char ch;

+#ifdef HASH_RANDOMIZATION

+    value = table->random_seed;

+#endif

     if (prefix != NULL)

 	value += 30 * (*prefix);

     else

@@ -156,6 +185,13 @@ xmlHashCreate(int size) {

         table->table = xmlMalloc(size * sizeof(xmlHashEntry));

         if (table->table) {

   	    memset(table->table, 0, size * sizeof(xmlHashEntry));

+#ifdef HASH_RANDOMIZATION

+            if (!hash_initialized) {

+                srand(time(NULL));

+                hash_initialized = 1;

+            }

+            table->random_seed = rand();

+#endif

   	    return(table);

         }

         xmlFree(table);

-- 

1.7.8.4

From 0cbeb50ee03ce582a0c979c70d8fbf030e270c37 Mon Sep 17 00:00:00 2001

From: Daniel Veillard <veillard@redhat.com>

Date: Mon, 15 Nov 2010 11:06:29 +0000

Subject: Fix a potential memory access error

in case of a previus allocation error

---

diff --git a/xpath.c b/xpath.c

index 4d6826d..81e33f6 100644

--- a/xpath.c

+++ b/xpath.c

@@ -3575,13 +3575,13 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) {

     } else if (cur->nodeNr == cur->nodeMax) {

         xmlNodePtr *temp;

-        cur->nodeMax *= 2;

-	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *

+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *

 				      sizeof(xmlNodePtr));

 	if (temp == NULL) {

 	    xmlXPathErrMemory(NULL, "growing nodeset\n");

 	    return;

 	}

+        cur->nodeMax *= 2;

 	cur->nodeTab = temp;

     }

     if (val->type == XML_NAMESPACE_DECL) {

--

cgit v0.8.3.1

From df83c17e5a2646bd923f75e5e507bc80d73c9722 Mon Sep 17 00:00:00 2001

From: Daniel Veillard <veillard@redhat.com>

Date: Wed, 17 Nov 2010 13:12:14 +0000

Subject: Fix a potential freeing error in XPath

---

diff --git a/xpath.c b/xpath.c

index 81e33f6..1447be5 100644

--- a/xpath.c

+++ b/xpath.c

@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,

 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {

 	        xmlXPathObjectPtr tmp;

-		/* pop the result */

+		/* pop the result if any */

 		tmp = valuePop(ctxt);

-		xmlXPathReleaseObject(xpctxt, tmp);

-		/* then pop off contextObj, which will be freed later */

-		valuePop(ctxt);

+                if (tmp != contextObj)

+                    /*

+                     * Free up the result

+                     * then pop off contextObj, which will be freed later

+                     */

+                    xmlXPathReleaseObject(xpctxt, tmp);

+                    valuePop(ctxt);

 		goto evaluation_error;

 	    }

--

cgit v0.8.3.1