Fix BZ #17269 -- _IO_wstr_overflow integer overflow

(cherry picked from commit bdf1ff052a8e23d637f2c838fa5642d78fcedc33)

diff --git a/ChangeLog b/ChangeLog
index 928b2267087e511e1ef1e830047fc9e187028391..68ee6c3402bd1a4fbf6f5c4a73b1ec6f3911d5fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-22  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       [BZ #17269]
+       * libio/wstrops.c (_IO_wstr_overflow): Guard against integer overflow
+       (enlarge_userbuf): Likewise.
+
 2015-02-26  Andreas Schwab  <schwab@suse.de>
 
        [BZ #18032]

diff --git a/NEWS b/NEWS
index 09fddab41d778cee8d33f7cf6b0abd2724f9bf45..e3588fce7a6bc03699c4ac5a2eb8dda0f650f656 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.21.1
 
 * The following bugs are resolved with this release:
 
-  17949, 18032, 18287, 18694.
+  17269, 17949, 18032, 18287, 18694.
 
 * A buffer overflow in gethostbyname_r and related functions performing DNS
   requests has been fixed.  If the NSS functions were called with a

diff --git a/libio/wstrops.c b/libio/wstrops.c
index 43d847d034af95fd7e8ca5c01798ed60f3bfa194..3993579bd144bc1a0dff50ca65469a9f1f29aa8c 100644 (file)
--- a/libio/wstrops.c
+++ b/libio/wstrops.c
@@ -95,8 +95,11 @@ _IO_wstr_overflow (fp, c)
          wchar_t *old_buf = fp->_wide_data->_IO_buf_base;
          size_t old_wblen = _IO_wblen (fp);
          _IO_size_t new_size = 2 * old_wblen + 100;
-         if (new_size < old_wblen)
+
+         if (__glibc_unlikely (new_size < old_wblen)
+             || __glibc_unlikely (new_size > SIZE_MAX / sizeof (wchar_t)))
            return EOF;
+
          new_buf
            = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size
                                                                        * sizeof (wchar_t));
@@ -186,6 +189,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
     return 1;
 
   _IO_size_t newsize = offset + 100;
+  if (__glibc_unlikely (newsize > SIZE_MAX / sizeof (wchar_t)))
+    return 1;
+
   wchar_t *oldbuf = wd->_IO_buf_base;
   wchar_t *newbuf
     = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (newsize