mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-14 07:10:05 +00:00
d8ca7a0c71
There is a data-dependency between the fields of struct l_reloc_result
and the field used as the initialization guard. Users of the guard
expect writes to the structure to be observable when they also observe
the guard initialized. The solution for this problem is to use an acquire
and release load and store to ensure previous writes to the structure are
observable if the guard is initialized.
The previous implementation used DL_FIXUP_VALUE_ADDR (l_reloc_result->addr)
as the initialization guard, making it impossible for some architectures
to load and store it atomically, i.e. hppa and ia64, due to its larger size.
This commit adds an unsigned int to l_reloc_result to be used as the new
initialization guard of the struct, making it possible to load and store
it atomically in all architectures. The fix ensures that the values
observed in l_reloc_result are consistent and do not lead to crashes.
The algorithm is documented in the code in elf/dl-runtime.c
(_dl_profile_fixup). Not all data races have been eliminated.
Tested with build-many-glibcs and on powerpc, powerpc64, and powerpc64le.
[BZ #23690]
* elf/dl-runtime.c (_dl_profile_fixup): Guarantee memory
modification order when accessing reloc_result->addr.
* include/link.h (reloc_result): Add field init.
* nptl/Makefile (tests): Add tst-audit-threads.
(modules-names): Add tst-audit-threads-mod1 and
tst-audit-threads-mod2.
Add rules to build tst-audit-threads.
* nptl/tst-audit-threads-mod1.c: New file.
* nptl/tst-audit-threads-mod2.c: Likewise.
* nptl/tst-audit-threads.c: Likewise.
* nptl/tst-audit-threads.h: Likewise.
Signed-off-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit e5d262effe)
75 lines
2.2 KiB
C
75 lines
2.2 KiB
C
/* Dummy audit library for test-audit-threads.
|
|
|
|
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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <elf.h>
|
|
#include <link.h>
|
|
#include <stdio.h>
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
/* We must use a dummy LD_AUDIT module to force the dynamic loader to
|
|
*not* update the real PLT, and instead use a cached value for the
|
|
lazy resolution result. It is the update of that cached value that
|
|
we are testing for correctness by doing this. */
|
|
|
|
/* Library to be audited. */
|
|
#define LIB "tst-audit-threads-mod2.so"
|
|
/* CALLNUM is the number of retNum functions. */
|
|
#define CALLNUM 7999
|
|
|
|
#define CONCATX(a, b) __CONCAT (a, b)
|
|
|
|
static int previous = 0;
|
|
|
|
unsigned int
|
|
la_version (unsigned int ver)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
unsigned int
|
|
la_objopen (struct link_map *map, Lmid_t lmid, uintptr_t *cookie)
|
|
{
|
|
return LA_FLG_BINDTO | LA_FLG_BINDFROM;
|
|
}
|
|
|
|
uintptr_t
|
|
CONCATX(la_symbind, __ELF_NATIVE_CLASS) (ElfW(Sym) *sym,
|
|
unsigned int ndx,
|
|
uintptr_t *refcook,
|
|
uintptr_t *defcook,
|
|
unsigned int *flags,
|
|
const char *symname)
|
|
{
|
|
const char * retnum = "retNum";
|
|
char * num = strstr (symname, retnum);
|
|
int n;
|
|
/* Validate if the symbols are getting called in the correct order.
|
|
This code is here to verify binutils does not optimize out the PLT
|
|
entries that require the symbol binding. */
|
|
if (num != NULL)
|
|
{
|
|
n = atoi (num);
|
|
assert (n >= previous);
|
|
assert (n <= CALLNUM);
|
|
previous = n;
|
|
}
|
|
return sym->st_value;
|
|
}
|