From patchwork Thu Jun 21 02:10:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel F. T. Gomes" X-Patchwork-Id: 27964 Received: (qmail 128711 invoked by alias); 21 Jun 2018 02:11:13 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 128432 invoked by uid 89); 21 Jun 2018 02:11:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_LOTSOFHASH, KAM_SHORT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: mo19.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH 06/14] ldbl-128ibm-compat: Add regular character, fortified printing functions Date: Wed, 20 Jun 2018 23:10:15 -0300 Message-ID: <20180621021023.17036-7-gabriel@inconstante.eti.br> In-Reply-To: <20180621021023.17036-1-gabriel@inconstante.eti.br> References: <20180621021023.17036-1-gabriel@inconstante.eti.br> MIME-Version: 1.0 X-ClientProxiedBy: EX3.emp.local (172.16.2.3) To EX4.emp.local (172.16.2.4) X-Ovh-Tracer-Id: 663717999078198979 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtiedrtdefgdehjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu Since the introduction of internal functions with explicit flags for the printf family of functions, the 'mode' parameter can be used to select which format long double parameters have (with the mode flags: PRINTF_LDBL_IS_DBL and PRINTF_LDBL_USES_FLOAT128), as well as to select whether to check for overflows (mode flag: PRINTF_FORTIFY). This patch combines PRINTF_LDBL_USES_FLOAT128 and PRINTF_FORTIFY to provide the IEEE binary128 version of printf-like function for platforms where long double can take this format, in addition to the double format and to some non-ieee format (currently, this means powerpc64le). Tested for powerpc64le. * sysdeps/ieee754/ldbl-128ibm-compat/Makefile: [subdir == stdio-common] (routines): Add ieee128-asprintf_chk, ieee128-dprintf_chk, ieee128-fprintf_chk, ieee128-printf_chk, ieee128-snprintf_chk, ieee128-sprintf_chk, ieee128-vasprintf_chk, ieee128-vdprintf_chk, ieee128-vfprintf_chk, ieee128-vprintf_chk, ieee128-vsnprintf_chk, and ieee128-vsprintf_chk. [subdir == stdio-common] (tests-internal): Add test-printf-chk-ieee128 and test-printf-chk-ibm128. [subdir == stdio-common] (CFLAGS-test-printf-chk-ieee128.c): New variable to add the relevant -mabi flags to the compilation. [subdir == stdio-common] (CFLAGS-test-printf-chk-ibm128.c): Likewise. [subdir == stdio-common && run-built-tests == yes] (tests-special): Add $(objpfx)test-printf-chk-ieee128.out, and $(objpfx)test-printf-chk-ibm128.out. [subdir == stdio-common] ($(objpfx)test-printf-chk-ieee128.out): New build and test rule. [subdir == stdio-common] ($(objpfx)test-printf-chk-ibm128.out): Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/Versions (libc): Add __asprintf_chkieee128, __dprintf_chkieee128, __fprintf_chkieee128, __printf_chkieee128, __snprintf_chkieee128, __sprintf_chkieee128, __vasprintf_chkieee128, __vdprintf_chkieee128, __vfprintf_chkieee128, __vprintf_chkieee128, __vsnprintf_chkieee128, __vsprintf_chkieee128. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c: New file. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c: Likewise. * sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.sh: Likewise. --- sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 33 +++++ sysdeps/ieee754/ldbl-128ibm-compat/Versions | 14 ++ .../ldbl-128ibm-compat/ieee128-asprintf_chk.c | 38 ++++++ .../ldbl-128ibm-compat/ieee128-dprintf_chk.c | 38 ++++++ .../ldbl-128ibm-compat/ieee128-fprintf_chk.c | 38 ++++++ .../ldbl-128ibm-compat/ieee128-printf_chk.c | 38 ++++++ .../ldbl-128ibm-compat/ieee128-snprintf_chk.c | 42 ++++++ .../ldbl-128ibm-compat/ieee128-sprintf_chk.c | 42 ++++++ .../ldbl-128ibm-compat/ieee128-vasprintf_chk.c | 31 +++++ .../ldbl-128ibm-compat/ieee128-vdprintf_chk.c | 30 +++++ .../ldbl-128ibm-compat/ieee128-vfprintf_chk.c | 30 +++++ .../ldbl-128ibm-compat/ieee128-vprintf_chk.c | 30 +++++ .../ldbl-128ibm-compat/ieee128-vsnprintf_chk.c | 34 +++++ .../ldbl-128ibm-compat/ieee128-vsprintf_chk.c | 34 +++++ .../ldbl-128ibm-compat/test-printf-chk-ibm128.c | 1 + .../ldbl-128ibm-compat/test-printf-chk-ieee128.c | 1 + .../test-printf-chk-ldbl-compat.c | 142 +++++++++++++++++++++ .../test-printf-chk-ldbl-compat.sh | 64 ++++++++++ 18 files changed, 680 insertions(+) create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.sh diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index e07074356b..78400a7a4a 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -23,6 +23,20 @@ routines += ieee128-vfwprintf routines += ieee128-vswprintf routines += ieee128-vwprintf +routines += ieee128-asprintf_chk +routines += ieee128-dprintf_chk +routines += ieee128-fprintf_chk +routines += ieee128-printf_chk +routines += ieee128-snprintf_chk +routines += ieee128-sprintf_chk + +routines += ieee128-vasprintf_chk +routines += ieee128-vdprintf_chk +routines += ieee128-vfprintf_chk +routines += ieee128-vprintf_chk +routines += ieee128-vsnprintf_chk +routines += ieee128-vsprintf_chk + # Printing long double values with IEEE binary128 format reuses part # of the internal float128 implementation (__printf_fp, __printf_fphex, # and __float128 variables and union members). Thus, the compilation of @@ -40,12 +54,19 @@ tests-internal += test-wprintf-ieee128 test-wprintf-ibm128 CFLAGS-test-wprintf-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi CFLAGS-test-wprintf-ibm128.c += -mabi=ibmlongdouble -Wno-psabi +tests-internal += test-printf-chk-ieee128 test-printf-chk-ibm128 +CFLAGS-test-printf-chk-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi +CFLAGS-test-printf-chk-ibm128.c += -mabi=ibmlongdouble -Wno-psabi + ifeq ($(run-built-tests),yes) tests-special += $(objpfx)test-printf-ieee128.out tests-special += $(objpfx)test-printf-ibm128.out tests-special += $(objpfx)test-wprintf-ieee128.out tests-special += $(objpfx)test-wprintf-ibm128.out + +tests-special += $(objpfx)test-printf-chk-ieee128.out +tests-special += $(objpfx)test-printf-chk-ibm128.out endif $(objpfx)test-printf-ieee128.out: \ @@ -71,4 +92,16 @@ $(objpfx)test-wprintf-ibm128.out: \ $(objpfx)test-wprintf-ibm128 $(SHELL) $^ '$(test-program-prefix)' $@; \ $(evaluate-test) + +$(objpfx)test-printf-chk-ieee128.out: \ + ../sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.sh \ + $(objpfx)test-printf-chk-ieee128 + $(SHELL) $^ '$(test-program-prefix)' $@; \ + $(evaluate-test) + +$(objpfx)test-printf-chk-ibm128.out: \ + ../sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.sh \ + $(objpfx)test-printf-chk-ibm128 + $(SHELL) $^ '$(test-program-prefix)' $@; \ + $(evaluate-test) endif diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Versions b/sysdeps/ieee754/ldbl-128ibm-compat/Versions index 4c3f8622b1..540237d6d4 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Versions +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Versions @@ -134,5 +134,19 @@ libc { __vfwprintfieee128; __vswprintfieee128; __vwprintfieee128; + + __asprintf_chkieee128; + __dprintf_chkieee128; + __fprintf_chkieee128; + __printf_chkieee128; + __snprintf_chkieee128; + __sprintf_chkieee128; + + __vasprintf_chkieee128; + __vdprintf_chkieee128; + __vfprintf_chkieee128; + __vprintf_chkieee128; + __vsnprintf_chkieee128; + __vsprintf_chkieee128; } } diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c new file mode 100644 index 0000000000..d3b9ee0b79 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c @@ -0,0 +1,38 @@ +/* Wrapper for __asprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include +#include + +extern int +___ieee128_asprintf_chk (char **string_ptr, int flag, const char *format, ...) +{ + va_list ap; + int done; + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + va_start (ap, format); + done = __vasprintf_internal (string_ptr, format, ap, mode); + va_end (ap); + + return done; +} +strong_alias (___ieee128_asprintf_chk, __asprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c new file mode 100644 index 0000000000..7b4ce157be --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c @@ -0,0 +1,38 @@ +/* Wrapper for __dprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include +#include + +extern int +___ieee128_dprintf_chk (int d, int flag, const char *format, ...) +{ + va_list ap; + int done; + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + va_start (ap, format); + done = __vdprintf_internal (d, format, ap, mode); + va_end (ap); + + return done; +} +strong_alias (___ieee128_dprintf_chk, __dprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c new file mode 100644 index 0000000000..a1ec25b6e8 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c @@ -0,0 +1,38 @@ +/* Wrapper for __fprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include +#include + +extern int +___ieee128_fprintf_chk (FILE *fp, int flag, const char *format, ...) +{ + va_list ap; + int done; + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + va_start (ap, format); + done = __vfprintf_internal (fp, format, ap, mode); + va_end (ap); + + return done; +} +strong_alias (___ieee128_fprintf_chk, __fprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c new file mode 100644 index 0000000000..b94ec7d5cd --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c @@ -0,0 +1,38 @@ +/* Wrapper for __printf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include +#include + +extern int +___ieee128_printf_chk (int flag, const char *format, ...) +{ + va_list ap; + int done; + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + va_start (ap, format); + done = __vfprintf_internal (stdout, format, ap, mode); + va_end (ap); + + return done; +} +strong_alias (___ieee128_printf_chk, __printf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c new file mode 100644 index 0000000000..5f5c0297fd --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c @@ -0,0 +1,42 @@ +/* Wrapper for __snprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include +#include + +extern int +___ieee128_snprintf_chk (char *s, size_t maxlen, int flag, size_t slen, + const char *format, ...) +{ + va_list ap; + int done; + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + if (__glibc_unlikely (slen < maxlen)) + __chk_fail (); + + va_start (ap, format); + done = __vsnprintf_internal (s, maxlen, format, ap, mode); + va_end (ap); + + return done; +} +strong_alias (___ieee128_snprintf_chk, __snprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c new file mode 100644 index 0000000000..05847df6ec --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c @@ -0,0 +1,42 @@ +/* Wrapper for __sprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include +#include + +extern int +___ieee128_sprintf_chk (char *s, int flag, size_t slen, + const char *format, ...) +{ + va_list ap; + int done; + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + if (slen == 0) + __chk_fail (); + + va_start (ap, format); + done = __vsprintf_internal (s, -1, format, ap, mode); + va_end (ap); + + return done; +} +strong_alias (___ieee128_sprintf_chk, __sprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c new file mode 100644 index 0000000000..5b1b5ad08a --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c @@ -0,0 +1,31 @@ +/* Wrapper for __vasprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include + +extern int +___ieee128_vasprintf_chk (char **result_ptr, int flag, const char *format, + va_list ap) +{ + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + return __vasprintf_internal (result_ptr, format, ap, mode); +} +strong_alias (___ieee128_vasprintf_chk, __vasprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c new file mode 100644 index 0000000000..b01fcb61a4 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c @@ -0,0 +1,30 @@ +/* Wrapper for __vdprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include + +extern int +___ieee128_vdprintf_chk (int d, int flag, const char *format, va_list ap) +{ + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + return __vdprintf_internal (d, format, ap, mode); +} +strong_alias (___ieee128_vdprintf_chk, __vdprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c new file mode 100644 index 0000000000..d3a494494c --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c @@ -0,0 +1,30 @@ +/* Wrapper for __vfprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include + +extern int +___ieee128_vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap) +{ + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + return __vfprintf_internal (fp, format, ap, mode); +} +strong_alias (___ieee128_vfprintf_chk, __vfprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c new file mode 100644 index 0000000000..c11d36f2ee --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c @@ -0,0 +1,30 @@ +/* Wrapper for __vprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include + +extern int +___ieee128_vprintf_chk (int flag, const char *format, va_list ap) +{ + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + return __vfprintf_internal (stdout, format, ap, mode); +} +strong_alias (___ieee128_vprintf_chk, __vprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c new file mode 100644 index 0000000000..9fc43a67c9 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c @@ -0,0 +1,34 @@ +/* Wrapper for __vsnprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include + +extern int +___ieee128_vsnprintf_chk (char *string, size_t maxlen, int flag, + size_t slen, const char *format, va_list ap) +{ + if (__glibc_unlikely (slen < maxlen)) + __chk_fail (); + + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + return __vsnprintf_internal (string, maxlen, format, ap, mode); +} +strong_alias (___ieee128_vsnprintf_chk, __vsnprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c new file mode 100644 index 0000000000..964a26f935 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c @@ -0,0 +1,34 @@ +/* Wrapper for __vsprintf_chk. IEEE128 version. + Copyright (C) 2018 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 + . */ + +#include + +extern int +___ieee128_vsprintf_chk (char *string, int flag, size_t slen, + const char *format, va_list ap) +{ + unsigned int mode = PRINTF_LDBL_USES_FLOAT128; + if (flag > 0) + mode |= PRINTF_FORTIFY; + + if (slen == 0) + __chk_fail (); + + return __vsprintf_internal (string, -1, format, ap, mode); +} +strong_alias (___ieee128_vsprintf_chk, __vsprintf_chkieee128) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c new file mode 100644 index 0000000000..7d50284d9c --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c new file mode 100644 index 0000000000..7d50284d9c --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c new file mode 100644 index 0000000000..3243a8ecf9 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c @@ -0,0 +1,142 @@ +/* Test for the long double variants of *printf_chk functions. + Copyright (C) 2018 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 + . */ + +#define _FORTIFY_SOURCE 2 + +#include +#include +#include + +#include + +static void +do_test_call_varg (FILE *stream, const char *format, ...) +{ + char *buffer = NULL; + char string[128]; + int res; + va_list args; + + printf ("%20s", "__vasprintf_chk: "); + va_start (args, format); + res = __vasprintf_chk (&buffer, 1, format, args); + va_end (args); + if (res == -1) + printf ("Error using vasprintf\n"); + if (buffer == NULL) + printf ("Error using vasprintf\n"); + else + { + printf ("%s", buffer); + free (buffer); + } + printf ("\n"); + + printf ("%20s", "__vdprintf_chk: "); + va_start (args, format); + __vdprintf_chk (1, 1, format, args); + va_end (args); + printf ("\n"); + + printf ("%20s", "__vfprintf_chk: "); + va_start (args, format); + __vfprintf_chk (stream, 1, format, args); + va_end (args); + printf ("\n"); + + printf ("%20s", "__vprintf_chk: "); + va_start (args, format); + __vprintf_chk (1, format, args); + va_end (args); + printf ("\n"); + + printf ("%20s", "__vsnprintf_chk: "); + va_start (args, format); + __vsnprintf_chk (string, 79, 1, 127, format, args); + va_end (args); + printf ("%s", string); + printf ("\n"); + + printf ("%20s", "__vsprintf_chk: "); + va_start (args, format); + __vsprintf_chk (string, 1, 127, format, args); + va_end (args); + printf ("%s", string); + printf ("\n"); +} + +static void +do_test_call_rarg (FILE *stream, const char *format, long double ld) +{ + char *buffer = NULL; + char string[128]; + int res; + + printf ("%20s", "__asprintf_chk: "); + res = __asprintf_chk (&buffer, 1, format, ld); + if (res == -1) + printf ("Error using vasprintf\n"); + if (buffer == NULL) + printf ("Error using asprintf\n"); + else + { + printf ("%s", buffer); + free (buffer); + } + printf ("\n"); + + printf ("%20s", "__dprintf_chk: "); + __dprintf_chk (1, 1, format, ld); + printf ("\n"); + + printf ("%20s", "__fprintf_chk: "); + __fprintf_chk (stdout, 1, format, ld); + printf ("\n"); + + printf ("%20s", "__printf_chk: "); + __printf_chk (1, format, ld); + printf ("\n"); + + printf ("%20s", "__snprintf_chk: "); + __snprintf_chk (string, 79, 1, 127, format, ld); + printf ("%s", string); + printf ("\n"); + + printf ("%20s", "__sprintf_chk: "); + __sprintf_chk (string, 1, 127, format, ld); + printf ("%s", string); + printf ("\n"); +} + +static int +do_test (void) +{ + long double ld = -1; + + /* Print in decimal notation. */ + do_test_call_rarg (stdout, "%.60Lf", ld); + do_test_call_varg (stdout, "%.60Lf", ld); + + /* Print in hexadecimal notation. */ + do_test_call_rarg (stdout, "%.60La", ld); + do_test_call_varg (stdout, "%.60La", ld); + + return 0; +} + +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.sh b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.sh new file mode 100644 index 0000000000..872e1e2721 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# Testing of *printf. IEEE binary128 for powerpc64le version. +# Copyright (C) 2018 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 +# . + +set -e + +test_program=$1; shift +test_program_prefix=$1; shift +test_program_output=$1; shift + +status=0 + +${test_program_prefix} \ + ${test_program} \ + > ${test_program_output} || status=1 + +cat <<'EOF' | + __asprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __dprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __fprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __printf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __snprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __sprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __vasprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __vdprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __vfprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __vprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __vsnprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __vsprintf_chk: -1.000000000000000000000000000000000000000000000000000000000000 + __asprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __dprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __fprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __printf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __snprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __sprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __vasprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __vdprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __vfprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __vprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __vsnprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 + __vsprintf_chk: -0x1.000000000000000000000000000000000000000000000000000000000000p+0 +EOF +cmp - ${test_program_output} > /dev/null 2>&1 || +{ + status=1 + echo "*** output comparison failed" +} + +exit $status