[Midnightbsd-cvs] src [7263] stable/0.6: MidnightBSD 0.6.6 RELEASE.

[laffer1 at midnightbsd.org]

Revision: 7263
          http://svnweb.midnightbsd.org/src/?rev=7263
Author:   laffer1
Date:     2015-08-18 17:01:17 -0400 (Tue, 18 Aug 2015)
Log Message:
-----------
MidnightBSD 0.6.6 RELEASE. - Fix a security issue with expat

Modified Paths:
--------------
    stable/0.6/UPDATING
    stable/0.6/contrib/expat/lib/xmlparse.c
    stable/0.6/sys/conf/newvers.sh

Modified: stable/0.6/UPDATING
===================================================================
--- stable/0.6/UPDATING	2015-08-18 20:53:31 UTC (rev 7262)
+++ stable/0.6/UPDATING	2015-08-18 21:01:17 UTC (rev 7263)
@@ -1,5 +1,10 @@
 Updating Information for MidnightBSD users.
 
+20160818:
+	MidnightBSD 0.6.6 RELEASE
+
+	Fix a security vulnerabiity in the expat XML parser.  
+
 20160805:
 	MidnightBSD 0.6.5 RELEASE
 

Modified: stable/0.6/contrib/expat/lib/xmlparse.c
===================================================================
--- stable/0.6/contrib/expat/lib/xmlparse.c	2015-08-18 20:53:31 UTC (rev 7262)
+++ stable/0.6/contrib/expat/lib/xmlparse.c	2015-08-18 21:01:17 UTC (rev 7263)
@@ -1600,6 +1600,12 @@
 void * XMLCALL
 XML_GetBuffer(XML_Parser parser, int len)
 {
+/* BEGIN MOZILLA CHANGE (sanity check len) */
+  if (len < 0) {
+    errorCode = XML_ERROR_NO_MEMORY;
+    return NULL;
+  }
+/* END MOZILLA CHANGE */
   switch (ps_parsing) {
   case XML_SUSPENDED:
     errorCode = XML_ERROR_SUSPENDED;
@@ -1611,8 +1617,13 @@
   }
 
   if (len > bufferLim - bufferEnd) {
-    /* FIXME avoid integer overflow */
     int neededSize = len + (int)(bufferEnd - bufferPtr);
+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
+    if (neededSize < 0) {
+      errorCode = XML_ERROR_NO_MEMORY;
+      return NULL;
+    }
+/* END MOZILLA CHANGE */
 #ifdef XML_CONTEXT_BYTES
     int keep = (int)(bufferPtr - buffer);
 
@@ -1641,7 +1652,15 @@
         bufferSize = INIT_BUFFER_SIZE;
       do {
         bufferSize *= 2;
-      } while (bufferSize < neededSize);
+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
+      } while (bufferSize < neededSize && bufferSize > 0);
+/* END MOZILLA CHANGE */
+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
+      if (bufferSize <= 0) {
+        errorCode = XML_ERROR_NO_MEMORY;
+        return NULL;
+      }
+/* END MOZILLA CHANGE */
       newBuf = (char *)MALLOC(bufferSize);
       if (newBuf == 0) {
         errorCode = XML_ERROR_NO_MEMORY;

Modified: stable/0.6/sys/conf/newvers.sh
===================================================================
--- stable/0.6/sys/conf/newvers.sh	2015-08-18 20:53:31 UTC (rev 7262)
+++ stable/0.6/sys/conf/newvers.sh	2015-08-18 21:01:17 UTC (rev 7263)
@@ -32,7 +32,7 @@
 # $MidnightBSD$
 
 TYPE="MidnightBSD"
-REVISION="0.6.5"
+REVISION="0.6.6"
 RELEASE="${REVISION}"
 VERSION="${TYPE} ${RELEASE}"
 SYSDIR=$(dirname $0)/..