Fix nan functions handling of payload strings (bug 16961, bug 16962).
The nan, nanf and nanl functions handle payload strings by doing e.g.:
if (tagp[0] != '\0')
{
char buf[6 + strlen (tagp)];
sprintf (buf, "NAN(%s)", tagp);
return strtod (buf, NULL);
}
This is an unbounded stack allocation based on the length of the
argument. Furthermore, if the argument starts with an n-char-sequence
followed by ')', that n-char-sequence is wrongly treated as
significant for determining the payload of the resulting NaN, when ISO
C says the call should be equivalent to strtod ("NAN", NULL), without
being affected by that initial n-char-sequence. This patch fixes both
those problems by using the __strtod_nan etc. functions recently
factored out of strtod etc. for that purpose, with those functions
being exported from libc at version GLIBC_PRIVATE.
Tested for x86_64, x86, mips64 and powerpc.
[BZ #16961]
[BZ #16962]
* math/s_nan.c (__nan): Use __strtod_nan instead of constructing a
string on the stack for strtod.
* math/s_nanf.c (__nanf): Use __strtof_nan instead of constructing
a string on the stack for strtof.
* math/s_nanl.c (__nanl): Use __strtold_nan instead of
constructing a string on the stack for strtold.
* stdlib/Versions (libc): Add __strtof_nan, __strtod_nan and
__strtold_nan to GLIBC_PRIVATE.
* math/test-nan-overflow.c: New file.
* math/test-nan-payload.c: Likewise.
* math/Makefile (tests): Add test-nan-overflow and
test-nan-payload.
2015-12-04 20:36:28 +00:00
|
|
|
/* Test nan functions payload handling (bug 16961).
|
2021-01-02 19:32:25 +00:00
|
|
|
Copyright (C) 2015-2021 Free Software Foundation, Inc.
|
Fix nan functions handling of payload strings (bug 16961, bug 16962).
The nan, nanf and nanl functions handle payload strings by doing e.g.:
if (tagp[0] != '\0')
{
char buf[6 + strlen (tagp)];
sprintf (buf, "NAN(%s)", tagp);
return strtod (buf, NULL);
}
This is an unbounded stack allocation based on the length of the
argument. Furthermore, if the argument starts with an n-char-sequence
followed by ')', that n-char-sequence is wrongly treated as
significant for determining the payload of the resulting NaN, when ISO
C says the call should be equivalent to strtod ("NAN", NULL), without
being affected by that initial n-char-sequence. This patch fixes both
those problems by using the __strtod_nan etc. functions recently
factored out of strtod etc. for that purpose, with those functions
being exported from libc at version GLIBC_PRIVATE.
Tested for x86_64, x86, mips64 and powerpc.
[BZ #16961]
[BZ #16962]
* math/s_nan.c (__nan): Use __strtod_nan instead of constructing a
string on the stack for strtod.
* math/s_nanf.c (__nanf): Use __strtof_nan instead of constructing
a string on the stack for strtof.
* math/s_nanl.c (__nanl): Use __strtold_nan instead of
constructing a string on the stack for strtold.
* stdlib/Versions (libc): Add __strtof_nan, __strtod_nan and
__strtold_nan to GLIBC_PRIVATE.
* math/test-nan-overflow.c: New file.
* math/test-nan-payload.c: Likewise.
* math/Makefile (tests): Add test-nan-overflow and
test-nan-payload.
2015-12-04 20:36:28 +00:00
|
|
|
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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
Fix nan functions handling of payload strings (bug 16961, bug 16962).
The nan, nanf and nanl functions handle payload strings by doing e.g.:
if (tagp[0] != '\0')
{
char buf[6 + strlen (tagp)];
sprintf (buf, "NAN(%s)", tagp);
return strtod (buf, NULL);
}
This is an unbounded stack allocation based on the length of the
argument. Furthermore, if the argument starts with an n-char-sequence
followed by ')', that n-char-sequence is wrongly treated as
significant for determining the payload of the resulting NaN, when ISO
C says the call should be equivalent to strtod ("NAN", NULL), without
being affected by that initial n-char-sequence. This patch fixes both
those problems by using the __strtod_nan etc. functions recently
factored out of strtod etc. for that purpose, with those functions
being exported from libc at version GLIBC_PRIVATE.
Tested for x86_64, x86, mips64 and powerpc.
[BZ #16961]
[BZ #16962]
* math/s_nan.c (__nan): Use __strtod_nan instead of constructing a
string on the stack for strtod.
* math/s_nanf.c (__nanf): Use __strtof_nan instead of constructing
a string on the stack for strtof.
* math/s_nanl.c (__nanl): Use __strtold_nan instead of
constructing a string on the stack for strtold.
* stdlib/Versions (libc): Add __strtof_nan, __strtod_nan and
__strtold_nan to GLIBC_PRIVATE.
* math/test-nan-overflow.c: New file.
* math/test-nan-payload.c: Likewise.
* math/Makefile (tests): Add test-nan-overflow and
test-nan-payload.
2015-12-04 20:36:28 +00:00
|
|
|
|
|
|
|
#include <float.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
/* Avoid built-in functions. */
|
|
|
|
#define WRAP_NAN(FUNC, STR) \
|
|
|
|
({ const char *volatile wns = (STR); FUNC (wns); })
|
|
|
|
#define WRAP_STRTO(FUNC, STR) \
|
|
|
|
({ const char *volatile wss = (STR); FUNC (wss, NULL); })
|
|
|
|
|
|
|
|
#define CHECK_IS_NAN(TYPE, A) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if (isnan (A)) \
|
|
|
|
puts ("PASS: " #TYPE " " #A); \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
puts ("FAIL: " #TYPE " " #A); \
|
|
|
|
result = 1; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
#define CHECK_SAME_NAN(TYPE, A, B) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if (memcmp (&(A), &(B), sizeof (A)) == 0) \
|
|
|
|
puts ("PASS: " #TYPE " " #A " = " #B); \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
puts ("FAIL: " #TYPE " " #A " = " #B); \
|
|
|
|
result = 1; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
#define CHECK_DIFF_NAN(TYPE, A, B) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if (memcmp (&(A), &(B), sizeof (A)) != 0) \
|
|
|
|
puts ("PASS: " #TYPE " " #A " != " #B); \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
puts ("FAIL: " #TYPE " " #A " != " #B); \
|
|
|
|
result = 1; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
/* Cannot test payloads by memcmp for formats where NaNs have padding
|
|
|
|
bits. */
|
|
|
|
#define CAN_TEST_EQ(MANT_DIG) ((MANT_DIG) != 64 && (MANT_DIG) != 106)
|
|
|
|
|
|
|
|
#define RUN_TESTS(TYPE, SFUNC, FUNC, MANT_DIG) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
TYPE n123 = WRAP_NAN (FUNC, "123"); \
|
|
|
|
CHECK_IS_NAN (TYPE, n123); \
|
|
|
|
TYPE s123 = WRAP_STRTO (SFUNC, "NAN(123)"); \
|
|
|
|
CHECK_IS_NAN (TYPE, s123); \
|
|
|
|
TYPE n456 = WRAP_NAN (FUNC, "456"); \
|
|
|
|
CHECK_IS_NAN (TYPE, n456); \
|
|
|
|
TYPE s456 = WRAP_STRTO (SFUNC, "NAN(456)"); \
|
|
|
|
CHECK_IS_NAN (TYPE, s456); \
|
|
|
|
TYPE n123x = WRAP_NAN (FUNC, "123)"); \
|
|
|
|
CHECK_IS_NAN (TYPE, n123x); \
|
|
|
|
TYPE nemp = WRAP_NAN (FUNC, ""); \
|
|
|
|
CHECK_IS_NAN (TYPE, nemp); \
|
|
|
|
TYPE semp = WRAP_STRTO (SFUNC, "NAN()"); \
|
|
|
|
CHECK_IS_NAN (TYPE, semp); \
|
|
|
|
TYPE sx = WRAP_STRTO (SFUNC, "NAN"); \
|
|
|
|
CHECK_IS_NAN (TYPE, sx); \
|
|
|
|
if (CAN_TEST_EQ (MANT_DIG)) \
|
|
|
|
CHECK_SAME_NAN (TYPE, n123, s123); \
|
|
|
|
if (CAN_TEST_EQ (MANT_DIG)) \
|
|
|
|
CHECK_SAME_NAN (TYPE, n456, s456); \
|
|
|
|
if (CAN_TEST_EQ (MANT_DIG)) \
|
|
|
|
CHECK_SAME_NAN (TYPE, nemp, semp); \
|
|
|
|
if (CAN_TEST_EQ (MANT_DIG)) \
|
|
|
|
CHECK_SAME_NAN (TYPE, n123x, sx); \
|
|
|
|
CHECK_DIFF_NAN (TYPE, n123, n456); \
|
|
|
|
CHECK_DIFF_NAN (TYPE, n123, nemp); \
|
|
|
|
CHECK_DIFF_NAN (TYPE, n123, n123x); \
|
|
|
|
CHECK_DIFF_NAN (TYPE, n456, nemp); \
|
|
|
|
CHECK_DIFF_NAN (TYPE, n456, n123x); \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
static int
|
|
|
|
do_test (void)
|
|
|
|
{
|
|
|
|
int result = 0;
|
|
|
|
RUN_TESTS (float, strtof, nanf, FLT_MANT_DIG);
|
|
|
|
RUN_TESTS (double, strtod, nan, DBL_MANT_DIG);
|
|
|
|
RUN_TESTS (long double, strtold, nanl, LDBL_MANT_DIG);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
|
|
#include "../test-skeleton.c"
|