about summary refs log tree commit diff
path: root/string/Makefile
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-09-23 11:24:30 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-09-23 11:29:53 +0530
commit303e567a8062200dc06acde7c76fc34679f08d8f (patch)
tree8e0c198956de9addb51216c5cfccd47d7c4be69b /string/Makefile
parent141f3a77fe4f1b59b0afa9bf6909cd2000448883 (diff)
downloadglibc-303e567a8062200dc06acde7c76fc34679f08d8f.tar.gz
glibc-303e567a8062200dc06acde7c76fc34679f08d8f.tar.xz
glibc-303e567a8062200dc06acde7c76fc34679f08d8f.zip
Check for integer overflow in cache size computation in strcoll
strcoll is implemented using a cache for indices and weights of
collation sequences in the strings so that subsequent passes do not
have to search through collation data again.  For very large string
inputs, the cache size computation could overflow.  In such a case,
use the fallback function that does not cache indices and weights of
collation sequences.

Fixes CVE-2012-4412.
Diffstat (limited to 'string/Makefile')
-rw-r--r--string/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/string/Makefile b/string/Makefile
index 736282875e..c2c7d376ec 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -57,6 +57,8 @@ tests		:= tester inl-tester noinl-tester testcopy test-ffs	\
 tests-ifunc := $(strop-tests:%=test-%-ifunc)
 tests += $(tests-ifunc)
 
+xtests = tst-strcoll-overflow
+
 include ../Rules
 
 tester-ENV = LANGUAGE=C