aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-09-23 11:20:02 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-09-23 11:29:53 +0530
commit141f3a77fe4f1b59b0afa9bf6909cd2000448883 (patch)
treeb82fc2e16b302d4fdb5c9983f8339eef93e99cd9 /ChangeLog
parent0b1f8e35640f5b3f7af11764ade3ff060211c309 (diff)
downloadglibc-141f3a77fe4f1b59b0afa9bf6909cd2000448883.zip
glibc-141f3a77fe4f1b59b0afa9bf6909cd2000448883.tar.gz
glibc-141f3a77fe4f1b59b0afa9bf6909cd2000448883.tar.bz2
Fall back to non-cached sequence traversal and comparison on malloc fail
strcoll currently falls back to alloca if malloc fails, resulting in a possible stack overflow. This patch implements sequence traversal and comparison without caching indices and rules. Fixes CVE-2012-4424.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 25664f0..148479e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-09-23 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ [BZ #14547]
+ * string/strcoll_l.c (coll_seq): New members rule, idx,
+ save_idx and back_us.
+ (get_next_seq_nocache): New function.
+ (do_compare_nocache): New function.
+ (STRCOLL): Use get_next_seq_nocache and do_compare_nocache
+ when malloc fails.
+
2013-09-23 Carlos O'Donell <carlos@redhat.com>
[BZ #15754]