diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2015-02-22 12:01:47 -0800 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2015-10-19 10:45:23 +0200 |
| commit | 012adb33827608d3b78e3832a1948b468b549946 (patch) | |
| tree | be9b0e56e462efc04a0afd58f9016eec4038f4d3 | |
| parent | fc843f6e48737d3d6690c5cf355d9719274efee1 (diff) | |
| download | glibc-012adb33827608d3b78e3832a1948b468b549946.tar.gz glibc-012adb33827608d3b78e3832a1948b468b549946.tar.xz glibc-012adb33827608d3b78e3832a1948b468b549946.zip | |
Fix BZ #17269 -- _IO_wstr_overflow integer overflow
(cherry picked from commit bdf1ff052a8e23d637f2c838fa5642d78fcedc33) Conflicts: ChangeLog NEWS
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | libio/wstrops.c | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a4f4e0d863..8d621b240b 100644 --- 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 c017fa3014..9e7316b4a7 100644 --- a/NEWS +++ b/NEWS @@ -11,7 +11,7 @@ Version 2.19.1 15946, 16545, 16574, 16623, 16657, 16695, 16743, 16878, 16882, 16885, 16916, 16932, 16943, 16958, 17048, 17069, 17079, 17137, 17153, 17213, - 17263, 17325, 17555, 18032, 18287. + 17263, 17269, 17325, 17555, 18032, 18287. * 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 399a377104..9218d4a5e3 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 |