2019-01-01 00:11:28 +00:00
|
|
|
/* Copyright (C) 2013-2019 Free Software Foundation, Inc.
|
2013-09-23 04:52:09 +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/>. */
|
2013-09-23 04:52:09 +00:00
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#include <stackguard-macros.h>
|
|
|
|
#include <tls.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
2017-04-05 13:34:39 +00:00
|
|
|
#ifndef _GNU_SOURCE
|
|
|
|
#define _GNU_SOURCE
|
|
|
|
#endif
|
|
|
|
/* Requires _GNU_SOURCE */
|
|
|
|
#include <getopt.h>
|
|
|
|
|
2013-09-23 04:52:09 +00:00
|
|
|
#ifndef POINTER_CHK_GUARD
|
|
|
|
extern uintptr_t __pointer_chk_guard;
|
|
|
|
# define POINTER_CHK_GUARD __pointer_chk_guard
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static const char *command;
|
|
|
|
static bool child;
|
|
|
|
static uintptr_t ptr_chk_guard_copy;
|
|
|
|
static bool ptr_chk_guard_copy_set;
|
|
|
|
static int fds[2];
|
|
|
|
|
|
|
|
static void __attribute__ ((constructor))
|
|
|
|
con (void)
|
|
|
|
{
|
|
|
|
ptr_chk_guard_copy = POINTER_CHK_GUARD;
|
|
|
|
ptr_chk_guard_copy_set = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
uintptr_t_cmp (const void *a, const void *b)
|
|
|
|
{
|
|
|
|
if (*(uintptr_t *) a < *(uintptr_t *) b)
|
|
|
|
return 1;
|
|
|
|
if (*(uintptr_t *) a > *(uintptr_t *) b)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
do_test (void)
|
|
|
|
{
|
|
|
|
if (!ptr_chk_guard_copy_set)
|
|
|
|
{
|
|
|
|
puts ("constructor has not been run");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
|
|
|
|
{
|
|
|
|
puts ("POINTER_CHK_GUARD changed between constructor and do_test");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (child)
|
|
|
|
{
|
|
|
|
write (2, &ptr_chk_guard_copy, sizeof (ptr_chk_guard_copy));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (command == NULL)
|
|
|
|
{
|
|
|
|
puts ("missing --command or --child argument");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define N 16
|
|
|
|
uintptr_t child_ptr_chk_guards[N + 1];
|
|
|
|
child_ptr_chk_guards[N] = ptr_chk_guard_copy;
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < N; ++i)
|
|
|
|
{
|
|
|
|
if (pipe (fds) < 0)
|
|
|
|
{
|
|
|
|
printf ("couldn't create pipe: %m\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pid_t pid = fork ();
|
|
|
|
if (pid < 0)
|
|
|
|
{
|
|
|
|
printf ("fork failed: %m\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!pid)
|
|
|
|
{
|
|
|
|
if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
|
|
|
|
{
|
|
|
|
puts ("POINTER_CHK_GUARD changed after fork");
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
close (fds[0]);
|
|
|
|
close (2);
|
|
|
|
dup2 (fds[1], 2);
|
|
|
|
close (fds[1]);
|
|
|
|
|
|
|
|
system (command);
|
|
|
|
exit (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
close (fds[1]);
|
|
|
|
|
|
|
|
if (TEMP_FAILURE_RETRY (read (fds[0], &child_ptr_chk_guards[i],
|
|
|
|
sizeof (uintptr_t))) != sizeof (uintptr_t))
|
|
|
|
{
|
|
|
|
puts ("could not read ptr_chk_guard value from child");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
close (fds[0]);
|
|
|
|
|
|
|
|
pid_t termpid;
|
|
|
|
int status;
|
|
|
|
termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0));
|
|
|
|
if (termpid == -1)
|
|
|
|
{
|
|
|
|
printf ("waitpid failed: %m\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else if (termpid != pid)
|
|
|
|
{
|
|
|
|
printf ("waitpid returned %ld != %ld\n",
|
|
|
|
(long int) termpid, (long int) pid);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else if (!WIFEXITED (status) || WEXITSTATUS (status))
|
|
|
|
{
|
|
|
|
puts ("child hasn't exited with exit status 0");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
qsort (child_ptr_chk_guards, N + 1, sizeof (uintptr_t), uintptr_t_cmp);
|
|
|
|
|
|
|
|
/* The default pointer guard is the same as the default stack guard.
|
|
|
|
They are only set to default if dl_random is NULL. */
|
|
|
|
uintptr_t default_guard = 0;
|
|
|
|
unsigned char *p = (unsigned char *) &default_guard;
|
|
|
|
p[sizeof (uintptr_t) - 1] = 255;
|
|
|
|
p[sizeof (uintptr_t) - 2] = '\n';
|
|
|
|
p[0] = 0;
|
|
|
|
|
|
|
|
/* Test if the pointer guard canaries are either randomized,
|
|
|
|
or equal to the default pointer guard value.
|
|
|
|
Even with randomized pointer guards it might happen
|
|
|
|
that the random number generator generates the same
|
|
|
|
values, but if that happens in more than half from
|
|
|
|
the 16 runs, something is very wrong. */
|
|
|
|
int ndifferences = 0;
|
|
|
|
int ndefaults = 0;
|
|
|
|
for (i = 0; i < N; ++i)
|
|
|
|
{
|
|
|
|
if (child_ptr_chk_guards[i] != child_ptr_chk_guards[i+1])
|
|
|
|
ndifferences++;
|
|
|
|
else if (child_ptr_chk_guards[i] == default_guard)
|
|
|
|
ndefaults++;
|
|
|
|
}
|
|
|
|
|
|
|
|
printf ("differences %d defaults %d\n", ndifferences, ndefaults);
|
|
|
|
|
|
|
|
if (ndifferences < N / 2 && ndefaults < N / 2)
|
|
|
|
{
|
|
|
|
puts ("pointer guard values are not randomized enough");
|
|
|
|
puts ("nor equal to the default value");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define OPT_COMMAND 10000
|
|
|
|
#define OPT_CHILD 10001
|
|
|
|
#define CMDLINE_OPTIONS \
|
|
|
|
{ "command", required_argument, NULL, OPT_COMMAND }, \
|
|
|
|
{ "child", no_argument, NULL, OPT_CHILD },
|
2017-04-05 13:34:39 +00:00
|
|
|
|
|
|
|
static void __attribute((used))
|
|
|
|
cmdline_process_function (int c)
|
|
|
|
{
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
case OPT_COMMAND:
|
|
|
|
command = optarg;
|
|
|
|
break;
|
|
|
|
case OPT_CHILD:
|
|
|
|
child = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define CMDLINE_PROCESS cmdline_process_function
|
|
|
|
|
|
|
|
#include <support/test-driver.c>
|