2021-01-02 19:32:25 +00:00
|
|
|
/* Copyright (C) 2017-2021 Free Software Foundation, Inc.
|
2017-02-02 10:16:01 +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/>. */
|
2017-02-02 10:16:01 +00:00
|
|
|
|
|
|
|
/* Verify that tunables correctly filter out unsafe tunables like
|
|
|
|
glibc.malloc.check and glibc.malloc.mmap_threshold but also retain
|
|
|
|
glibc.malloc.mmap_threshold in an unprivileged child. */
|
|
|
|
|
Suppress internal declarations for most of the testsuite.
This patch adds a new build module called 'testsuite'.
IS_IN (testsuite) implies _ISOMAC, as do IS_IN_build and __cplusplus
(which means several ad-hoc tests for __cplusplus can go away).
libc-symbols.h now suppresses almost all of *itself* when _ISOMAC is
defined; in particular, _ISOMAC mode does not get config.h
automatically anymore.
There are still quite a few tests that need to see internal gunk of
one variety or another. For them, we now have 'tests-internal' and
'test-internal-extras'; files in this category will still be compiled
with MODULE_NAME=nonlib, and everything proceeds as it always has.
The bulk of this patch is moving tests from 'tests' to
'tests-internal'. There is also 'tests-static-internal', which has
the same effect on files in 'tests-static', and 'modules-names-tests',
which has the *inverse* effect on files in 'modules-names' (it's
inverted because most of the things in modules-names are *not* tests).
For both of these, the file must appear in *both* the new variable and
the old one.
There is also now a special case for when libc-symbols.h is included
without MODULE_NAME being defined at all. (This happens during the
creation of libc-modules.h, and also when preprocessing Versions
files.) When this happens, IS_IN is set to be always false and
_ISOMAC is *not* defined, which was the status quo, but now it's
explicit.
The remaining changes to C source files in this patch seemed likely to
cause problems in the absence of the main change. They should be
relatively self-explanatory. In a few cases I duplicated a definition
from an internal header rather than move the test to tests-internal;
this was a judgement call each time and I'm happy to change those
however reviewers feel is more appropriate.
* Makerules: New subdir configuration variables 'tests-internal'
and 'test-internal-extras'. Test files in these categories will
still be compiled with MODULE_NAME=nonlib. Test files in the
existing categories (tests, xtests, test-srcs, test-extras) are
now compiled with MODULE_NAME=testsuite.
New subdir configuration variable 'modules-names-tests'. Files
which are in both 'modules-names' and 'modules-names-tests' will
be compiled with MODULE_NAME=testsuite instead of
MODULE_NAME=extramodules.
(gen-as-const-headers): Move to tests-internal.
(do-tests-clean, common-mostlyclean): Support tests-internal.
* Makeconfig (built-modules): Add testsuite.
* Makefile: Change libof-check-installed-headers-c and
libof-check-installed-headers-cxx to 'testsuite'.
* Rules: Likewise. Support tests-internal.
* benchtests/strcoll-inputs/filelist#en_US.UTF-8:
Remove extra-modules.mk.
* config.h.in: Don't check for __OPTIMIZE__ or __FAST_MATH__ here.
* include/libc-symbols.h: Move definitions of _GNU_SOURCE,
PASTE_NAME, PASTE_NAME1, IN_MODULE, IS_IN, and IS_IN_LIB to the
very top of the file and rationalize their order.
If MODULE_NAME is not defined at all, define IS_IN to always be
false, and don't define _ISOMAC.
If any of IS_IN (testsuite), IS_IN_build, or __cplusplus are
true, define _ISOMAC and suppress everything else in this file,
starting with the inclusion of config.h.
Do check for inappropriate definitions of __OPTIMIZE__ and
__FAST_MATH__ here, but only if _ISOMAC is not defined.
Correct some out-of-date commentary.
* include/math.h: If _ISOMAC is defined, undefine NO_LONG_DOUBLE
and _Mlong_double_ before including math.h.
* include/string.h: If _ISOMAC is defined, don't expose
_STRING_ARCH_unaligned. Move a comment to a more appropriate
location.
* include/errno.h, include/stdio.h, include/stdlib.h, include/string.h
* include/time.h, include/unistd.h, include/wchar.h: No need to
check __cplusplus nor use __BEGIN_DECLS/__END_DECLS.
* misc/sys/cdefs.h (__NTHNL): New macro.
* sysdeps/m68k/m680x0/fpu/bits/mathinline.h
(__m81_defun): Use __NTHNL to avoid errors with GCC 6.
* elf/tst-env-setuid-tunables.c: Include config.h with _LIBC
defined, for HAVE_TUNABLES.
* inet/tst-checks-posix.c: No need to define _ISOMAC.
* intl/tst-gettext2.c: Provide own definition of N_.
* math/test-signgam-finite-c99.c: No need to define _ISOMAC.
* math/test-signgam-main.c: No need to define _ISOMAC.
* stdlib/tst-strtod.c: Convert to test-driver. Split locale_test to...
* stdlib/tst-strtod1i.c: ...this new file.
* stdlib/tst-strtod5.c: Convert to test-driver and add copyright notice.
Split tests of __strtod_internal to...
* stdlib/tst-strtod5i.c: ...this new file.
* string/test-string.h: Include stdint.h. Duplicate definition of
inhibit_loop_to_libcall here (from libc-symbols.h).
* string/test-strstr.c: Provide dummy definition of
libc_hidden_builtin_def when including strstr.c.
* sysdeps/ia64/fpu/libm-symbols.h: Suppress entire file in _ISOMAC
mode; no need to test __STRICT_ANSI__ nor __cplusplus as well.
* sysdeps/x86_64/fpu/math-tests-arch.h: Include cpu-features.h.
Don't include init-arch.h.
* sysdeps/x86_64/multiarch/test-multiarch.h: Include cpu-features.h.
Don't include init-arch.h.
* elf/Makefile: Move tst-ptrguard1-static, tst-stackguard1-static,
tst-tls1-static, tst-tls2-static, tst-tls3-static, loadtest,
unload, unload2, circleload1, neededtest, neededtest2,
neededtest3, neededtest4, tst-tls1, tst-tls2, tst-tls3,
tst-tls6, tst-tls7, tst-tls8, tst-dlmopen2, tst-ptrguard1,
tst-stackguard1, tst-_dl_addr_inside_object, and all of the
ifunc tests to tests-internal.
Don't add $(modules-names) to test-extras.
* inet/Makefile: Move tst-inet6_scopeid_pton to tests-internal.
Add tst-deadline to tests-static-internal.
* malloc/Makefile: Move tst-mallocstate and tst-scratch_buffer to
tests-internal.
* misc/Makefile: Move tst-atomic and tst-atomic-long to tests-internal.
* nptl/Makefile: Move tst-typesizes, tst-rwlock19, tst-sem11,
tst-sem12, tst-sem13, tst-barrier5, tst-signal7, tst-tls3,
tst-tls3-malloc, tst-tls5, tst-stackguard1, tst-sem11-static,
tst-sem12-static, and tst-stackguard1-static to tests-internal.
Link tests-internal with libpthread also.
Don't add $(modules-names) to test-extras.
* nss/Makefile: Move tst-field to tests-internal.
* posix/Makefile: Move bug-regex5, bug-regex20, bug-regex33,
tst-rfc3484, tst-rfc3484-2, and tst-rfc3484-3 to tests-internal.
* stdlib/Makefile: Move tst-strtod1i, tst-strtod3, tst-strtod4,
tst-strtod5i, tst-tls-atexit, and tst-tls-atexit-nodelete to
tests-internal.
* sunrpc/Makefile: Move tst-svc_register to tests-internal.
* sysdeps/powerpc/Makefile: Move test-get_hwcap and
test-get_hwcap-static to tests-internal.
* sysdeps/unix/sysv/linux/Makefile: Move tst-setgetname to
tests-internal.
* sysdeps/x86_64/fpu/Makefile: Add all libmvec test modules to
modules-names-tests.
2016-11-21 01:46:30 +00:00
|
|
|
/* This is compiled as part of the testsuite but needs to see
|
|
|
|
HAVE_TUNABLES. */
|
|
|
|
#define _LIBC 1
|
|
|
|
#include "config.h"
|
|
|
|
#undef _LIBC
|
|
|
|
|
2021-03-16 07:07:54 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <intprops.h>
|
|
|
|
#include <array_length.h>
|
|
|
|
|
|
|
|
#include <support/check.h>
|
|
|
|
#include <support/support.h>
|
|
|
|
#include <support/test-driver.h>
|
|
|
|
#include <support/capture_subprocess.h>
|
|
|
|
|
|
|
|
const char *teststrings[] =
|
|
|
|
{
|
|
|
|
"glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096",
|
2021-03-16 07:07:55 +00:00
|
|
|
"glibc.malloc.check=2:glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096:glibc.malloc.check=2",
|
|
|
|
"glibc.malloc.perturb=0x800",
|
|
|
|
"glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.perturb=0x800:not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.not_valid.check=2:glibc.malloc.mmap_threshold=4096",
|
|
|
|
"not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
|
2023-09-19 22:39:32 +00:00
|
|
|
"glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.check=2",
|
2021-03-16 07:07:55 +00:00
|
|
|
"glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096:glibc.malloc.check=2",
|
|
|
|
"glibc.malloc.check=4:glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096",
|
|
|
|
":glibc.malloc.garbage=2:glibc.malloc.check=1",
|
|
|
|
"glibc.malloc.check=1:glibc.malloc.check=2",
|
|
|
|
"not_valid.malloc.check=2",
|
|
|
|
"glibc.not_valid.check=2",
|
2021-03-16 07:07:54 +00:00
|
|
|
};
|
2017-02-02 10:16:01 +00:00
|
|
|
|
2021-03-16 07:07:54 +00:00
|
|
|
const char *resultstrings[] =
|
|
|
|
{
|
|
|
|
"glibc.malloc.mmap_threshold=4096",
|
2021-03-16 07:07:55 +00:00
|
|
|
"glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.perturb=0x800",
|
|
|
|
"glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.mmap_threshold=4096",
|
|
|
|
"glibc.malloc.mmap_threshold=4096",
|
2023-09-19 22:39:32 +00:00
|
|
|
"glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096",
|
|
|
|
"",
|
2021-03-16 07:07:55 +00:00
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
2021-03-16 07:07:54 +00:00
|
|
|
};
|
2017-02-02 10:16:01 +00:00
|
|
|
|
|
|
|
static int
|
2021-03-16 07:07:54 +00:00
|
|
|
test_child (int off)
|
2017-02-02 10:16:01 +00:00
|
|
|
{
|
|
|
|
const char *val = getenv ("GLIBC_TUNABLES");
|
|
|
|
|
2017-02-02 10:18:06 +00:00
|
|
|
#if HAVE_TUNABLES
|
2023-09-19 22:39:32 +00:00
|
|
|
printf (" [%d] GLIBC_TUNABLES is %s\n", off, val);
|
|
|
|
fflush (stdout);
|
2021-03-16 07:07:54 +00:00
|
|
|
if (val != NULL && strcmp (val, resultstrings[off]) == 0)
|
2017-02-02 10:16:01 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (val != NULL)
|
2023-09-19 22:39:32 +00:00
|
|
|
printf (" [%d] Unexpected GLIBC_TUNABLES VALUE %s, expected %s\n",
|
|
|
|
off, val, resultstrings[off]);
|
|
|
|
else
|
|
|
|
printf (" [%d] GLIBC_TUNABLES environment variable absent\n", off);
|
|
|
|
|
|
|
|
fflush (stdout);
|
2017-02-02 10:16:01 +00:00
|
|
|
|
|
|
|
return 1;
|
2017-02-02 10:18:06 +00:00
|
|
|
#else
|
|
|
|
if (val != NULL)
|
|
|
|
{
|
2021-03-16 07:07:54 +00:00
|
|
|
printf ("[%d] GLIBC_TUNABLES not cleared\n", off);
|
2017-02-02 10:18:06 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
#endif
|
2017-02-02 10:16:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2021-03-16 07:07:54 +00:00
|
|
|
do_test (int argc, char **argv)
|
2017-02-02 10:16:01 +00:00
|
|
|
{
|
2021-03-16 07:07:54 +00:00
|
|
|
/* Setgid child process. */
|
|
|
|
if (argc == 2)
|
|
|
|
{
|
|
|
|
if (getgid () == getegid ())
|
|
|
|
/* This can happen if the file system is mounted nosuid. */
|
|
|
|
FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
|
|
|
|
(intmax_t) getgid ());
|
2017-02-02 10:16:01 +00:00
|
|
|
|
2021-03-16 07:07:54 +00:00
|
|
|
int ret = test_child (atoi (argv[1]));
|
2017-02-02 10:16:01 +00:00
|
|
|
|
2021-03-16 07:07:54 +00:00
|
|
|
if (ret != 0)
|
|
|
|
exit (1);
|
2017-02-02 10:16:01 +00:00
|
|
|
|
2023-09-19 22:39:32 +00:00
|
|
|
/* Special return code to make sure that the child executed all the way
|
|
|
|
through. */
|
|
|
|
exit (42);
|
2021-03-16 07:07:54 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Spawn tests. */
|
|
|
|
for (int i = 0; i < array_length (teststrings); i++)
|
|
|
|
{
|
|
|
|
char buf[INT_BUFSIZE_BOUND (int)];
|
|
|
|
|
2023-09-19 22:39:32 +00:00
|
|
|
printf ("[%d] Spawned test for %s\n", i, teststrings[i]);
|
2021-03-16 07:07:54 +00:00
|
|
|
snprintf (buf, sizeof (buf), "%d\n", i);
|
2023-09-19 22:39:32 +00:00
|
|
|
fflush (stdout);
|
2021-03-16 07:07:54 +00:00
|
|
|
if (setenv ("GLIBC_TUNABLES", teststrings[i], 1) != 0)
|
2023-09-19 22:39:32 +00:00
|
|
|
{
|
|
|
|
printf (" [%d] Failed to set GLIBC_TUNABLES: %m", i);
|
|
|
|
support_record_failure ();
|
|
|
|
continue;
|
|
|
|
}
|
2021-03-16 07:07:54 +00:00
|
|
|
|
|
|
|
int status = support_capture_subprogram_self_sgid (buf);
|
|
|
|
|
|
|
|
/* Bail out early if unsupported. */
|
|
|
|
if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
|
|
|
|
return EXIT_UNSUPPORTED;
|
|
|
|
|
2023-09-19 22:39:32 +00:00
|
|
|
if (WEXITSTATUS (status) != 42)
|
|
|
|
{
|
|
|
|
printf (" [%d] child failed with status %d\n", i,
|
|
|
|
WEXITSTATUS (status));
|
|
|
|
support_record_failure ();
|
|
|
|
}
|
2021-03-16 07:07:54 +00:00
|
|
|
}
|
2023-09-19 22:39:32 +00:00
|
|
|
return 0;
|
2021-03-16 07:07:54 +00:00
|
|
|
}
|
2017-02-02 10:16:01 +00:00
|
|
|
}
|
2021-03-16 07:07:54 +00:00
|
|
|
|
|
|
|
#define TEST_FUNCTION_ARGV do_test
|
|
|
|
#include <support/test-driver.c>
|