public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/arm/morello/main] Fix OOB read in stdlib thousand grouping parsing [BZ #29727]
Date: Wed, 23 Nov 2022 14:38:35 +0000 (GMT)	[thread overview]
Message-ID: <20221123143835.57AA23853D78@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1fb0a3690270bcf3e5eb9d978bf050bfe1261c93

commit 1fb0a3690270bcf3e5eb9d978bf050bfe1261c93
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Tue Oct 11 15:24:41 2022 +0100

    Fix OOB read in stdlib thousand grouping parsing [BZ #29727]
    
    __correctly_grouped_prefixmb only worked with thousands_len == 1,
    otherwise it read past the end of cp or thousands.
    
    This affects scanf formats like %'d, %'f and the internal but
    exposed __strto{l,ul,f,d,..}_internal with grouping flag set
    and an LC_NUMERIC locale where thousands_len > 1.
    
    Avoid OOB access by considering thousands_len when initializing cp.
    This fixes bug 29727.
    
    Found by the morello port with strict bounds checking where
    
    FAIL: stdlib/tst-strtod4
    FAIL: stdlib/tst-strtod5i
    
    crashed using a locale with thousands_len==3.

Diff:
---
 stdlib/grouping.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/stdlib/grouping.c b/stdlib/grouping.c
index be7922f5fd..4622897488 100644
--- a/stdlib/grouping.c
+++ b/stdlib/grouping.c
@@ -64,9 +64,17 @@ __correctly_grouped_prefixmb (const STRING_TYPE *begin, const STRING_TYPE *end,
   thousands_len = strlen (thousands);
 #endif
 
+#ifdef USE_WIDE_CHAR
   while (end > begin)
+#else
+  while (end - begin >= thousands_len)
+#endif
     {
+#ifdef USE_WIDE_CHAR
       const STRING_TYPE *cp = end - 1;
+#else
+      const STRING_TYPE *cp = end - thousands_len;
+#endif
       const char *gp = grouping;
 
       /* Check first group.  */

             reply	other threads:[~2022-11-23 14:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-23 14:38 Szabolcs Nagy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-27 13:48 Szabolcs Nagy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221123143835.57AA23853D78@sourceware.org \
    --to=nsz@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).