diff mbox

Fix BZ #17269 _IO_wstr_overflow integer overflow

Message ID CAPC3xapaAjL-J9zkq+GRxoHDcuSC1Nm3+YohNR-CgSdHkZm-VA@mail.gmail.com
State New
Headers show

Commit Message

Paul Pluzhnikov Feb. 22, 2015, 7:44 p.m. UTC 
On Sun, Feb 22, 2015 at 2:20 AM, Florian Weimer <fw@deneb.enyo.de> wrote:

> “new_size == SIZE_MAX / sizeof (wchar_t)” should still be okay,
> shouldn't it?

Right.

2015-02-22  Paul Pluzhnikov  <ppluzhnikov@google.com>

        [BZ #17269]
        * NEWS: Mention 17269
        * libio/wstrops.c (_IO_wstr_overflow): Guard against integer overflow
        (enlarge_userbuf): Likewise.

Comments

Florian Weimer Feb. 22, 2015, 7:47 p.m. UTC | #1 
* Paul Pluzhnikov:

> On Sun, Feb 22, 2015 at 2:20 AM, Florian Weimer <fw@deneb.enyo.de> wrote:
>
>> “new_size == SIZE_MAX / sizeof (wchar_t)” should still be okay,
>> shouldn't it?
>
> Right.

Okay to commit, but …

> 2015-02-22  Paul Pluzhnikov  <ppluzhnikov@google.com>
>
>         [BZ #17269]
>         * NEWS: Mention 17269
>         * libio/wstrops.c (_IO_wstr_overflow): Guard against integer overflow
>         (enlarge_userbuf): Likewise.

… no changelog entry for NEWS, please.

Will you ask on oss-security for CVE assignment?
Paul Pluzhnikov Feb. 22, 2015, 8:03 p.m. UTC | #2 
On Sun, Feb 22, 2015 at 11:47 AM, Florian Weimer <fw@deneb.enyo.de> wrote:

> Okay to commit, but …

Thanks, committed.

> Will you ask on oss-security for CVE assignment?

Sure.
diff mbox

Patch

diff --git a/NEWS b/NEWS
index 5eb79d2..28ef45d 100644
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,9 @@  Version 2.22
 
 * The following bugs are resolved with this release:
 
-  4719, 13064, 14094, 15319, 15467, 15790, 16560, 17569, 17588, 17792,
-  17912, 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987,
-  17991, 17996, 17998, 17999.
+  4719, 13064, 14094, 15319, 15467, 15790, 16560, 17269, 17569, 17588,
+  17792, 17912, 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978,
+  17987, 17991, 17996, 17998, 17999.
 
 * Character encoding and ctype tables were updated to Unicode 7.0.0, using
   new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red
diff --git a/libio/wstrops.c b/libio/wstrops.c
index 43d847d..3993579 100644
--- 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