diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2015-02-22 12:01:47 -0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-07-20 22:35:37 -0400 |
| commit | 8a4e5cc6574a419d5724bef6be98d705d58db48d (patch) | |
| tree | d25ff1a4b1b15eeab3d19e45af9c82ed17c1d723 | |
| parent | fe7b1136e5753c85b3ccc8395dfc66b82052d73c (diff) | |
| download | glibc-8a4e5cc6574a419d5724bef6be98d705d58db48d.tar.gz glibc-8a4e5cc6574a419d5724bef6be98d705d58db48d.tar.xz glibc-8a4e5cc6574a419d5724bef6be98d705d58db48d.zip | |
Fix BZ #17269 -- _IO_wstr_overflow integer overflow
(cherry picked from commit bdf1ff052a8e23d637f2c838fa5642d78fcedc33)
| -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 928b226708..68ee6c3402 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 09fddab41d..e3588fce7a 100644 --- 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 43d847d034..3993579bd1 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 |