main/icu: security fixes #7193 (CVE-2017-7867, CVE-2017-7868)

2 files changed, 168 insertions, 4 deletions

diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index 307d44a76c..dedb047c15 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -5,7 +5,7 @@ pkgver=55.1
 # convert x.y.z to x_y_z
 _ver=${pkgver//./_}
 
-pkgrel=2
+pkgrel=3
 pkgdesc="International Components for Unicode library"
 url="http://www.icu-project.org/"
 arch="all"
@@ -17,8 +17,14 @@ source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver
 	icu-timezone.patch
 	CVE-2015-1270.patch
 	CVE-2016-7415.patch
+	CVE-2017-7867-7868.patch
 	"
 
+# secfixes:
+#   55.1-r3:
+#     - CVE-2017-7867
+#     - CVE-2017-7868
+
 _builddir="$srcdir"/icu/source
 
 prepare() {
@@ -72,12 +78,15 @@ libs() {
 md5sums="e2d523df79d6cb7855c2fbe284f4db29  icu4c-55_1-src.tgz
 2c81d9c9a6ea0af5b7391e001f37a5e0  icu-timezone.patch
 a96d030215717af9f86df767dad18c9d  CVE-2015-1270.patch
-12b7d114d596a5daaf632816bbf91edf  CVE-2016-7415.patch"
+12b7d114d596a5daaf632816bbf91edf  CVE-2016-7415.patch
+5d1d5d52155eaa36b9e8eb89ee0fd5cc  CVE-2017-7867-7868.patch"
 sha256sums="e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b  icu4c-55_1-src.tgz
 1c3c432228ee254af7adc995d65b65a4c9dac3b868fe1e49fe588a0ffa55a158  icu-timezone.patch
 ab91523197421856caa4dfd2d0540901d098d1a470a7b3d8fec1986f0ad0f305  CVE-2015-1270.patch
-7392b0685dd46a3f731e6d3a83ff3f42067eb80f99e434ff801afe2aa38da6b8  CVE-2016-7415.patch"
+7392b0685dd46a3f731e6d3a83ff3f42067eb80f99e434ff801afe2aa38da6b8  CVE-2016-7415.patch
+408f9efdf73d9dc0a700de611d57109a7a85e75895a650b8d459962709939243  CVE-2017-7867-7868.patch"
 sha512sums="21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35  icu4c-55_1-src.tgz
 40489c36e28e160f08e045acab6c19cdb712ad3b7f87f67099deac7d579aaf13d8841cd3278a6bb0e998b5c34a378348a13fcc8bb14c9c4eb4f6adbd10d66825  icu-timezone.patch
 129ff2e3f12bbce46bfaee13660348fe28a0665b19c27af58484dc25a4ce25cfc8bce3a3c4155bc5ff18fd8269d6e1f061dbbcb5679f285678167b8abcd1f809  CVE-2015-1270.patch
-0aef517165b3aea0e081db63ba2e75e57af7b4fc05eb0cdd222606001efd8bbca1457910f5909515a4a2b14c2d2c7dac426d659d16021cd8d05096c8c12fc64d  CVE-2016-7415.patch"
+0aef517165b3aea0e081db63ba2e75e57af7b4fc05eb0cdd222606001efd8bbca1457910f5909515a4a2b14c2d2c7dac426d659d16021cd8d05096c8c12fc64d  CVE-2016-7415.patch
+4b6a6d5a2d96ca2beb400170278745871f6903ff6d0b1e83ddaae3e13dfc872e94805e16540f2e2e9f797cdf9b47d06152e728ed76c77a63c36aeeb1ad8870ad  CVE-2017-7867-7868.patch"
diff --git a/main/icu/CVE-2017-7867-7868.patch b/main/icu/CVE-2017-7867-7868.patch
new file mode 100644
index 0000000000..df18283c2b
--- /dev/null
+++ b/main/icu/CVE-2017-7867-7868.patch
@@ -0,0 +1,155 @@
+Index: source/common/utext.cpp

+===================================================================

+--- source/common/utext.cpp	(revision 39670)

++++ source/common/utext.cpp	(revision 39671)

+@@ -848,7 +848,13 @@

+ 

+ // Chunk size.

+-//     Must be less than 85, because of byte mapping from UChar indexes to native indexes.

+-//     Worst case is three native bytes to one UChar.  (Supplemenaries are 4 native bytes

+-//     to two UChars.)

++//     Must be less than 42  (256/6), because of byte mapping from UChar indexes to native indexes.

++//     Worst case there are six UTF-8 bytes per UChar.

++//         obsolete 6 byte form fd + 5 trails maps to fffd

++//         obsolete 5 byte form fc + 4 trails maps to fffd

++//         non-shortest 4 byte forms maps to fffd

++//         normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit

++//     mapToUChars array size must allow for the worst case, 6.

++//     This could be brought down to 4, by treating fd and fc as pure illegal,

++//     rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros.

+ //

+ enum { UTF8_TEXT_CHUNK_SIZE=32 };

+@@ -890,5 +896,5 @@

+                                                      //    one for a supplementary starting in the last normal position,

+                                                      //    and one for an entry for the buffer limit position.

+-    uint8_t   mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to

++    uint8_t   mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to

+                                                      //   correspoding offset in filled part of buf.

+     int32_t   align;

+@@ -1033,4 +1039,5 @@

+             u8b = (UTF8Buf *)ut->p;   // the current buffer

+             mapIndex = ix - u8b->toUCharsMapStart;

++            U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));

+             ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;

+             return TRUE;

+@@ -1299,4 +1306,8 @@

+         //   If index is at the end, there is no character there to look at.

+         if (ix != ut->b) {

++            // Note: this function will only move the index back if it is on a trail byte

++            //       and there is a preceding lead byte and the sequence from the lead 

++            //       through this trail could be part of a valid UTF-8 sequence

++            //       Otherwise the index remains unchanged.

+             U8_SET_CP_START(s8, 0, ix);

+         }

+@@ -1312,5 +1323,8 @@

+         uint8_t *mapToNative = u8b->mapToNative;

+         uint8_t *mapToUChars = u8b->mapToUChars;

+-        int32_t  toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1);

++        int32_t  toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1;

++        // Note that toUCharsMapStart can be negative. Happens when the remaining

++        // text from current position to the beginning is less than the buffer size.

++        // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry.

+         int32_t  destIx = UTF8_TEXT_CHUNK_SIZE+2;   // Start in the overflow region

+                                                     //   at end of buffer to leave room

+@@ -1339,4 +1353,5 @@

+                 // Special case ASCII range for speed.

+                 buf[destIx] = (UChar)c;

++                U_ASSERT(toUCharsMapStart <= srcIx);

+                 mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx;

+                 mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart);

+@@ -1368,4 +1383,5 @@

+                     mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx;

+                 } while (sIx >= srcIx);

++                U_ASSERT(toUCharsMapStart <= (srcIx+1));

+ 

+                 // Set native indexing limit to be the current position.

+@@ -1542,4 +1558,5 @@

+     U_ASSERT(index<=ut->chunkNativeLimit);

+     int32_t mapIndex = index - u8b->toUCharsMapStart;

++    U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));

+     int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;

+     U_ASSERT(offset>=0 && offset<=ut->chunkLength);

+Index: source/test/intltest/utxttest.cpp

+===================================================================

+--- source/test/intltest/utxttest.cpp	(revision 39670)

++++ source/test/intltest/utxttest.cpp	(revision 39671)

+@@ -68,4 +68,6 @@

+         case 7: name = "Ticket12130";

+             if (exec) Ticket12130(); break;

++        case 8: name = "Ticket12888";

++            if (exec) Ticket12888(); break;

+         default: name = "";          break;

+     }

+@@ -1584,2 +1586,62 @@

+     utext_close(&ut);

+ }

++

++// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal,

++//               six byte utf-8 forms. Original implementation had an assumption that

++//               there would be at most three utf-8 bytes per UTF-16 code unit.

++//               The five and six byte sequences map to a single replacement character.

++

++void UTextTest::Ticket12888() {

++    const char *badString = 

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

++            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80";

++

++    UErrorCode status = U_ZERO_ERROR;

++    LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status));

++    TEST_SUCCESS(status);

++    for (;;) {

++        UChar32 c = utext_next32(ut.getAlias());

++        if (c == U_SENTINEL) {

++            break;

++        }

++    }

++    int32_t endIdx = utext_getNativeIndex(ut.getAlias());

++    if (endIdx != (int32_t)strlen(badString)) {

++        errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx);

++        return;

++    }

++

++    for (int32_t prevIndex = endIdx; prevIndex>0;) {

++        UChar32 c = utext_previous32(ut.getAlias());

++        int32_t currentIndex = utext_getNativeIndex(ut.getAlias());

++        if (c != 0xfffd) {

++            errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n",

++                    __FILE__, __LINE__, 0xfffd, c, currentIndex);

++            break;

++        }

++        if (currentIndex != prevIndex - 6) {

++            errln("%s:%d: wrong index. Expected, actual = %d, %d",

++                    __FILE__, __LINE__, prevIndex - 6, currentIndex);

++            break;

++        }

++        prevIndex = currentIndex;

++    }

++}

+Index: source/test/intltest/utxttest.h

+===================================================================

+--- source/test/intltest/utxttest.h	(revision 39670)

++++ source/test/intltest/utxttest.h	(revision 39671)

+@@ -39,4 +39,5 @@

+     void Ticket10983();

+     void Ticket12130();

++    void Ticket12888();

+ 

+ private: