|
 |
ce426f |
commit 41488498b6d9440ee66ab033808cce8323bba7ac
|
|
|
ce426f |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
ce426f |
Date: Wed Sep 3 19:45:43 2014 +0200
|
|
|
ce426f |
|
|
|
ce426f |
CVE-2014-6040: Crashes on invalid input in IBM gconv modules [BZ #17325]
|
|
|
ce426f |
|
|
|
ce426f |
These changes are based on the fix for BZ #14134 in commit
|
|
|
ce426f |
6e230d11837f3ae7b375ea69d7905f0d18eb79e5.
|
|
|
ce426f |
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/Makefile glibc-2.17-c758a686/iconvdata/Makefile
|
|
|
ce426f |
index 0a410a1..b6327d6 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/Makefile
|
|
|
ce426f |
@@ -297,6 +297,7 @@ $(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
|
|
|
ce426f |
$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
|
|
|
ce426f |
$(addprefix $(objpfx),$(modules.so)) \
|
|
|
ce426f |
$(common-objdir)/iconv/iconv_prog TESTS
|
|
|
ce426f |
+ iconv_modules="$(modules)" \
|
|
|
ce426f |
$(SHELL) $< $(common-objdir) '$(test-wrapper)' > $@
|
|
|
ce426f |
|
|
|
ce426f |
$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/ibm1364.c glibc-2.17-c758a686/iconvdata/ibm1364.c
|
|
|
ce426f |
index 0b5484f..cf80993 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/ibm1364.c
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/ibm1364.c
|
|
|
ce426f |
@@ -221,7 +221,8 @@ enum
|
|
|
ce426f |
++rp2; \
|
|
|
ce426f |
\
|
|
|
ce426f |
uint32_t res; \
|
|
|
ce426f |
- if (__builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
+ if (__builtin_expect (rp2->start == 0xffff, 0) \
|
|
|
ce426f |
+ || __builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
|| (res = DB_TO_UCS4[ch + rp2->idx], \
|
|
|
ce426f |
__builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
|
|
|
ce426f |
{ \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/ibm932.c glibc-2.17-c758a686/iconvdata/ibm932.c
|
|
|
ce426f |
index f5dca59..aa69d65 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/ibm932.c
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/ibm932.c
|
|
|
ce426f |
@@ -74,11 +74,12 @@
|
|
|
ce426f |
} \
|
|
|
ce426f |
\
|
|
|
ce426f |
ch = (ch * 0x100) + inptr[1]; \
|
|
|
ce426f |
+ /* ch was less than 0xfd. */ \
|
|
|
ce426f |
+ assert (ch < 0xfd00); \
|
|
|
ce426f |
while (ch > rp2->end) \
|
|
|
ce426f |
++rp2; \
|
|
|
ce426f |
\
|
|
|
ce426f |
- if (__builtin_expect (rp2 == NULL, 0) \
|
|
|
ce426f |
- || __builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
+ if (__builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
|| (res = __ibm932db_to_ucs4[ch + rp2->idx], \
|
|
|
ce426f |
__builtin_expect (res, '\1') == 0 && ch !=0)) \
|
|
|
ce426f |
{ \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/ibm933.c glibc-2.17-c758a686/iconvdata/ibm933.c
|
|
|
ce426f |
index f46dfb5..461fb5e 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/ibm933.c
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/ibm933.c
|
|
|
ce426f |
@@ -162,7 +162,7 @@ enum
|
|
|
ce426f |
while (ch > rp2->end) \
|
|
|
ce426f |
++rp2; \
|
|
|
ce426f |
\
|
|
|
ce426f |
- if (__builtin_expect (rp2 == NULL, 0) \
|
|
|
ce426f |
+ if (__builtin_expect (rp2->start == 0xffff, 0) \
|
|
|
ce426f |
|| __builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
|| (res = __ibm933db_to_ucs4[ch + rp2->idx], \
|
|
|
ce426f |
__builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/ibm935.c glibc-2.17-c758a686/iconvdata/ibm935.c
|
|
|
ce426f |
index a8e4e6c..132d816 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/ibm935.c
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/ibm935.c
|
|
|
ce426f |
@@ -162,7 +162,7 @@ enum
|
|
|
ce426f |
while (ch > rp2->end) \
|
|
|
ce426f |
++rp2; \
|
|
|
ce426f |
\
|
|
|
ce426f |
- if (__builtin_expect (rp2 == NULL, 0) \
|
|
|
ce426f |
+ if (__builtin_expect (rp2->start == 0xffff, 0) \
|
|
|
ce426f |
|| __builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
|| (res = __ibm935db_to_ucs4[ch + rp2->idx], \
|
|
|
ce426f |
__builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/ibm937.c glibc-2.17-c758a686/iconvdata/ibm937.c
|
|
|
ce426f |
index 239be61..69b154d 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/ibm937.c
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/ibm937.c
|
|
|
ce426f |
@@ -162,7 +162,7 @@ enum
|
|
|
ce426f |
while (ch > rp2->end) \
|
|
|
ce426f |
++rp2; \
|
|
|
ce426f |
\
|
|
|
ce426f |
- if (__builtin_expect (rp2 == NULL, 0) \
|
|
|
ce426f |
+ if (__builtin_expect (rp2->start == 0xffff, 0) \
|
|
|
ce426f |
|| __builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
|| (res = __ibm937db_to_ucs4[ch + rp2->idx], \
|
|
|
ce426f |
__builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/ibm939.c glibc-2.17-c758a686/iconvdata/ibm939.c
|
|
|
ce426f |
index 5d0db36..9936e2c 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/ibm939.c
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/ibm939.c
|
|
|
ce426f |
@@ -162,7 +162,7 @@ enum
|
|
|
ce426f |
while (ch > rp2->end) \
|
|
|
ce426f |
++rp2; \
|
|
|
ce426f |
\
|
|
|
ce426f |
- if (__builtin_expect (rp2 == NULL, 0) \
|
|
|
ce426f |
+ if (__builtin_expect (rp2->start == 0xffff, 0) \
|
|
|
ce426f |
|| __builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
|| (res = __ibm939db_to_ucs4[ch + rp2->idx], \
|
|
|
ce426f |
__builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/ibm943.c glibc-2.17-c758a686/iconvdata/ibm943.c
|
|
|
ce426f |
index be0c14f..c5d5742 100644
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/ibm943.c
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/ibm943.c
|
|
|
ce426f |
@@ -75,11 +75,12 @@
|
|
|
ce426f |
} \
|
|
|
ce426f |
\
|
|
|
ce426f |
ch = (ch * 0x100) + inptr[1]; \
|
|
|
ce426f |
+ /* ch was less than 0xfd. */ \
|
|
|
ce426f |
+ assert (ch < 0xfd00); \
|
|
|
ce426f |
while (ch > rp2->end) \
|
|
|
ce426f |
++rp2; \
|
|
|
ce426f |
\
|
|
|
ce426f |
- if (__builtin_expect (rp2 == NULL, 0) \
|
|
|
ce426f |
- || __builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
+ if (__builtin_expect (ch < rp2->start, 0) \
|
|
|
ce426f |
|| (res = __ibm943db_to_ucs4[ch + rp2->idx], \
|
|
|
ce426f |
__builtin_expect (res, '\1') == 0 && ch !=0)) \
|
|
|
ce426f |
{ \
|
|
|
ce426f |
diff --git glibc-2.17-c758a686/iconvdata/run-iconv-test.sh glibc-2.17-c758a686/iconvdata/run-iconv-test.sh
|
|
|
ce426f |
index c98c929..5dfb69f 100755
|
|
|
ce426f |
--- glibc-2.17-c758a686/iconvdata/run-iconv-test.sh
|
|
|
ce426f |
+++ glibc-2.17-c758a686/iconvdata/run-iconv-test.sh
|
|
|
ce426f |
@@ -184,6 +184,24 @@ while read utf8 from filename; do
|
|
|
ce426f |
|
|
|
ce426f |
done < TESTS2
|
|
|
ce426f |
|
|
|
ce426f |
+# Check for crashes in decoders.
|
|
|
ce426f |
+printf '\016\377\377\377\377\377\377\377' > $temp1
|
|
|
ce426f |
+for from in $iconv_modules ; do
|
|
|
ce426f |
+ echo $ac_n "test decoder $from $ac_c"
|
|
|
ce426f |
+ PROG=`eval echo $ICONV`
|
|
|
ce426f |
+ if $PROG < $temp1 >/dev/null 2>&1 ; then
|
|
|
ce426f |
+ : # fall through
|
|
|
ce426f |
+ else
|
|
|
ce426f |
+ status=$?
|
|
|
ce426f |
+ if test $status -gt 1 ; then
|
|
|
ce426f |
+ echo "/FAILED"
|
|
|
ce426f |
+ failed=1
|
|
|
ce426f |
+ continue
|
|
|
ce426f |
+ fi
|
|
|
ce426f |
+ fi
|
|
|
ce426f |
+ echo "OK"
|
|
|
ce426f |
+done
|
|
|
ce426f |
+
|
|
|
ce426f |
exit $failed
|
|
|
ce426f |
# Local Variables:
|
|
|
ce426f |
# mode:shell-script
|