git: libstdc++: Fix unsigned wraparound in codecvt::do_length [PR105857]

John Marino marino at crater.dragonflybsd.org
Sat Nov 30 11:06:02 PST 2024


commit bd23261bc0d14eee4147ed68391498b1c45ec286
Author: John Marino <dragonflybsd at marino.st>
Date:   Sat Nov 30 12:58:54 2024 +0100

    libstdc++: Fix unsigned wraparound in codecvt::do_length [PR105857]
    
    When the max argument to std::codecvt<wchar_t, char, mbstate_t>::length
    is SIZE_MAX/4+1 or greater the multiplication with sizeof(wchar_t) will
    wrap to a small value, and the alloca call will have a buffer that's
    smaller than requested. The call to mbsnrtowcs then has a buffer that is
    smaller than the value passed as the buffer length. When libstdc++.so is
    built with -D_FORTIFY_SOURCE=3 the mismatched buffer and length will get
    detected and will abort inside Glibc.
    
    When it doesn't abort, there's no buffer overflow because Glibc's
    mbsnrtowcs has the same len * sizeof(wchar_t) calculation to determine
    the size of the buffer in bytes, and that will wrap to the same small
    number as the alloca argument. So luckily Glibc agrees with the caller
    about the real size of the buffer, and won't overflow it.
    
    Even when the max argument isn't large enough to wrap, it can still be
    much too large to safely pass to alloca, so we should limit that. We
    already have a loop that processes chunks so that we can handle null
    characters in the middle of the input. If we limit the alloca buffer to
    4kB then we'll just loop each time that buffer is filled.
    
    Reported-by: Jonathan Wakely (GNU GCC)

Summary of changes:
 .../libstdc++-v3/config/locale/dragonfly/codecvt_members.cc      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/bd23261bc0d14eee4147ed68391498b1c45ec286


-- 
DragonFly BSD source repository


More information about the Commits mailing list