Andreas Schwab
fcfeca27fe
- Update to glibc 2.32
* Unicode 13.0.0 Support
* New locale added: ckb_IQ
* The GNU C Library now loads audit modules listed in the DT_AUDIT and
DT_DEPAUDIT dynamic section entries of the main executable
* powerpc64le supports IEEE128 long double libm/libc redirects when
using the -mabi=ieeelongdouble to compile C code on supported GCC
toolchains
* To help detect buffer overflows and other out-of-bounds accesses
several APIs have been annotated with GCC 'access' attribute
* On Linux, functions the pthread_attr_setsigmask_np and
pthread_attr_getsigmask_np have been added
* The GNU C Library now provides the header file <sys/single_threaded.h>
which declares the variable __libc_single_threaded
* The functions sigabbrev_np and sigdescr_np have been added
* The functions strerrorname_np and strerrordesc_np have been added
* AArch64 now supports standard branch protection security hardening
in glibc when it is built with a GCC that is configured with
--enable-standard-branch-protection (or if -mbranch-protection=standard
flag is passed when building both GCC target libraries and glibc,
in either case a custom GCC is needed)
* The deprecated <sys/sysctl.h> header and the sysctl function have been
removed
* The sstk function is no longer available to newly linked binaries
* The legacy signal handling functions siginterrupt, sigpause, sighold,
sigrelse, sigignore and sigset, and the sigmask macro have been
deprecated
* ldconfig now defaults to the new format for ld.so.cache
* The deprecated arrays sys_siglist, _sys_siglist, and sys_sigabbrev
are no longer available to newly linked binaries, and their declarations
OBS-URL: https://build.opensuse.org/request/show/824657
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=567
135 lines
4.9 KiB
Diff
135 lines
4.9 KiB
Diff
Fix buffer overrun in EUC-KR conversion module (bug 24973)
|
|
|
|
The byte 0xfe as input to the EUC-KR conversion denotes a user-defined
|
|
area and is not allowed. The from_euc_kr function used to skip two bytes
|
|
when told to skip over the unknown designation, potentially running over
|
|
the buffer end.
|
|
|
|
[BZ #24973]
|
|
* iconvdata/ksc5601.h (ksc5601_to_ucs4): Check for available bytes
|
|
first.
|
|
* iconvdata/euc-kr.c (BODY for FROM_LOOP): Don't check for unknown
|
|
two-byte codes here.
|
|
* iconvdata/Makefile (tests): Add bug-iconv13.
|
|
* iconvdata/bug-iconv13.c: New file.
|
|
---
|
|
iconvdata/Makefile | 2 +-
|
|
iconvdata/bug-iconv13.c | 53 +++++++++++++++++++++++++++++++++++++++++
|
|
iconvdata/euc-kr.c | 6 +----
|
|
iconvdata/ksc5601.h | 6 ++---
|
|
4 files changed, 58 insertions(+), 9 deletions(-)
|
|
create mode 100644 iconvdata/bug-iconv13.c
|
|
|
|
Index: glibc-2.32/iconvdata/Makefile
|
|
===================================================================
|
|
--- glibc-2.32.orig/iconvdata/Makefile
|
|
+++ glibc-2.32/iconvdata/Makefile
|
|
@@ -73,7 +73,8 @@ modules.so := $(addsuffix .so, $(modules
|
|
ifeq (yes,$(build-shared))
|
|
tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
|
|
tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
|
|
- bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4
|
|
+ bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \
|
|
+ bug-iconv13
|
|
ifeq ($(have-thread-library),yes)
|
|
tests += bug-iconv3
|
|
endif
|
|
Index: glibc-2.32/iconvdata/bug-iconv13.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.32/iconvdata/bug-iconv13.c
|
|
@@ -0,0 +1,53 @@
|
|
+/* bug 24973: Test EUC-KR module
|
|
+ Copyright (C) 2019 Free Software Foundation, Inc.
|
|
+ This file is part of the GNU C Library.
|
|
+
|
|
+ The GNU C Library is free software; you can redistribute it and/or
|
|
+ modify it under the terms of the GNU Lesser General Public
|
|
+ License as published by the Free Software Foundation; either
|
|
+ version 2.1 of the License, or (at your option) any later version.
|
|
+
|
|
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ Lesser General Public License for more details.
|
|
+
|
|
+ You should have received a copy of the GNU Lesser General Public
|
|
+ License along with the GNU C Library; if not, see
|
|
+ <https://www.gnu.org/licenses/>. */
|
|
+
|
|
+#include <errno.h>
|
|
+#include <iconv.h>
|
|
+#include <stdio.h>
|
|
+#include <support/check.h>
|
|
+
|
|
+static int
|
|
+do_test (void)
|
|
+{
|
|
+ iconv_t cd = iconv_open ("UTF-8//IGNORE", "EUC-KR");
|
|
+ TEST_VERIFY_EXIT (cd != (iconv_t) -1);
|
|
+
|
|
+ /* 0xfe (->0x7e : row 94) and 0xc9 (->0x49 : row 41) are user-defined
|
|
+ areas, which are not allowed and should be skipped over due to
|
|
+ //IGNORE. The trailing 0xfe also is an incomplete sequence, which
|
|
+ should be checked first. */
|
|
+ char input[4] = { '\xc9', '\xa1', '\0', '\xfe' };
|
|
+ char *inptr = input;
|
|
+ size_t insize = sizeof (input);
|
|
+ char output[4];
|
|
+ char *outptr = output;
|
|
+ size_t outsize = sizeof (output);
|
|
+
|
|
+ /* This used to crash due to buffer overrun. */
|
|
+ TEST_VERIFY (iconv (cd, &inptr, &insize, &outptr, &outsize) == (size_t) -1);
|
|
+ TEST_VERIFY (errno == EINVAL);
|
|
+ /* The conversion should produce one character, the converted null
|
|
+ character. */
|
|
+ TEST_VERIFY (sizeof (output) - outsize == 1);
|
|
+
|
|
+ TEST_VERIFY_EXIT (iconv_close (cd) != -1);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+#include <support/test-driver.c>
|
|
Index: glibc-2.32/iconvdata/euc-kr.c
|
|
===================================================================
|
|
--- glibc-2.32.orig/iconvdata/euc-kr.c
|
|
+++ glibc-2.32/iconvdata/euc-kr.c
|
|
@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned c
|
|
\
|
|
if (ch <= 0x9f) \
|
|
++inptr; \
|
|
- /* 0xfe(->0x7e : row 94) and 0xc9(->0x59 : row 41) are \
|
|
- user-defined areas. */ \
|
|
- else if (__builtin_expect (ch == 0xa0, 0) \
|
|
- || __builtin_expect (ch > 0xfe, 0) \
|
|
- || __builtin_expect (ch == 0xc9, 0)) \
|
|
+ else if (__glibc_unlikely (ch == 0xa0)) \
|
|
{ \
|
|
/* This is illegal. */ \
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
|
|
Index: glibc-2.32/iconvdata/ksc5601.h
|
|
===================================================================
|
|
--- glibc-2.32.orig/iconvdata/ksc5601.h
|
|
+++ glibc-2.32/iconvdata/ksc5601.h
|
|
@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s
|
|
unsigned char ch2;
|
|
int idx;
|
|
|
|
+ if (avail < 2)
|
|
+ return 0;
|
|
+
|
|
/* row 94(0x7e) and row 41(0x49) are user-defined area in KS C 5601 */
|
|
|
|
if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) >= 0x7e
|
|
|| (ch - offset) == 0x49)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
- if (avail < 2)
|
|
- return 0;
|
|
-
|
|
ch2 = (*s)[1];
|
|
if (ch2 < offset || (ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
|
|
return __UNKNOWN_10646_CHAR;
|