mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
elf: Add audit tests for modules with TLSDESC
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
parent
063f9ba220
commit
d1b38173c9
16
elf/Makefile
16
elf/Makefile
@ -394,6 +394,22 @@ modules-names += tst-gnu2-tls1mod
|
||||
$(objpfx)tst-gnu2-tls1: $(objpfx)tst-gnu2-tls1mod.so
|
||||
tst-gnu2-tls1mod.so-no-z-defs = yes
|
||||
CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=gnu2
|
||||
|
||||
tests += tst-audit-tlsdesc tst-audit-tlsdesc-dlopen
|
||||
modules-names += tst-audit-tlsdesc-mod1 tst-audit-tlsdesc-mod2 tst-auditmod-tlsdesc
|
||||
$(objpfx)tst-audit-tlsdesc: $(objpfx)tst-audit-tlsdesc-mod1.so \
|
||||
$(objpfx)tst-audit-tlsdesc-mod2.so \
|
||||
$(shared-thread-library)
|
||||
CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=gnu2
|
||||
CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=gnu2
|
||||
$(objpfx)tst-audit-tlsdesc-dlopen: $(shared-thread-library)
|
||||
$(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-audit-tlsdesc-mod1.so \
|
||||
$(objpfx)tst-audit-tlsdesc-mod2.so
|
||||
$(objpfx)tst-audit-tlsdesc-mod1.so: $(objpfx)tst-audit-tlsdesc-mod2.so
|
||||
$(objpfx)tst-audit-tlsdesc.out: $(objpfx)tst-auditmod-tlsdesc.so
|
||||
tst-audit-tlsdesc-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc.so
|
||||
$(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-auditmod-tlsdesc.so
|
||||
tst-audit-tlsdesc-dlopen-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc.so
|
||||
endif
|
||||
ifeq (yes,$(have-protected-data))
|
||||
modules-names += tst-protected1moda tst-protected1modb
|
||||
|
67
elf/tst-audit-tlsdesc-dlopen.c
Normal file
67
elf/tst-audit-tlsdesc-dlopen.c
Normal file
@ -0,0 +1,67 @@
|
||||
/* DT_AUDIT with modules with TLSDESC.
|
||||
Copyright (C) 2021 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
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <support/check.h>
|
||||
#include <support/xthread.h>
|
||||
#include <support/xdlfcn.h>
|
||||
|
||||
static void *
|
||||
thr_func (void *mod)
|
||||
{
|
||||
int* (*get_global1)(void) = xdlsym (mod, "get_global1");
|
||||
int* (*get_global2)(void) = xdlsym (mod, "get_global2");
|
||||
void (*set_global2)(int) = xdlsym (mod, "set_global2");
|
||||
int* (*get_local1)(void) = xdlsym (mod, "get_local1");
|
||||
int* (*get_local2)(void) = xdlsym (mod, "get_local2");
|
||||
|
||||
int *global1 = get_global1 ();
|
||||
TEST_COMPARE (*global1, 0);
|
||||
++*global1;
|
||||
|
||||
int *global2 = get_global2 ();
|
||||
TEST_COMPARE (*global2, 0);
|
||||
++*global2;
|
||||
TEST_COMPARE (*global2, 1);
|
||||
|
||||
set_global2 (10);
|
||||
TEST_COMPARE (*global2, 10);
|
||||
|
||||
int *local1 = get_local1 ();
|
||||
TEST_COMPARE (*local1, 0);
|
||||
++*local1;
|
||||
|
||||
int *local2 = get_local2 ();
|
||||
TEST_COMPARE (*local2, 0);
|
||||
++*local2;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
void *mod = xdlopen ("tst-audit-tlsdesc-mod1.so", RTLD_LAZY);
|
||||
|
||||
pthread_t thr = xpthread_create (NULL, thr_func, mod);
|
||||
void *r = xpthread_join (thr);
|
||||
TEST_VERIFY (r == NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include <support/test-driver.c>
|
41
elf/tst-audit-tlsdesc-mod1.c
Normal file
41
elf/tst-audit-tlsdesc-mod1.c
Normal file
@ -0,0 +1,41 @@
|
||||
/* DT_AUDIT with modules with TLSDESC.
|
||||
Copyright (C) 2021 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
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
__thread int global1;
|
||||
|
||||
int *
|
||||
get_global1 (void)
|
||||
{
|
||||
return &global1;
|
||||
}
|
||||
|
||||
static __thread int local1;
|
||||
|
||||
void *
|
||||
get_local1 (void)
|
||||
{
|
||||
return &local1;
|
||||
}
|
||||
|
||||
extern __thread int global2;
|
||||
|
||||
void
|
||||
set_global2 (int v)
|
||||
{
|
||||
global2 = v;
|
||||
}
|
33
elf/tst-audit-tlsdesc-mod2.c
Normal file
33
elf/tst-audit-tlsdesc-mod2.c
Normal file
@ -0,0 +1,33 @@
|
||||
/* DT_AUDIT with modules with TLSDESC.
|
||||
Copyright (C) 2021 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
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
__thread int global2;
|
||||
|
||||
int *
|
||||
get_global2 (void)
|
||||
{
|
||||
return &global2;
|
||||
}
|
||||
|
||||
static __thread int local2;
|
||||
|
||||
void *
|
||||
get_local2 (void)
|
||||
{
|
||||
return &local2;
|
||||
}
|
60
elf/tst-audit-tlsdesc.c
Normal file
60
elf/tst-audit-tlsdesc.c
Normal file
@ -0,0 +1,60 @@
|
||||
/* DT_AUDIT with modules with TLSDESC.
|
||||
Copyright (C) 2021 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
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <support/check.h>
|
||||
#include <support/xthread.h>
|
||||
|
||||
extern __thread int global1;
|
||||
extern __thread int global2;
|
||||
void *get_local1 (void);
|
||||
void set_global2 (int v);
|
||||
void *get_local2 (void);
|
||||
|
||||
static void *
|
||||
thr_func (void *clousure)
|
||||
{
|
||||
TEST_COMPARE (global1, 0);
|
||||
++global1;
|
||||
TEST_COMPARE (global2, 0);
|
||||
++global2;
|
||||
TEST_COMPARE (global2, 1);
|
||||
|
||||
set_global2 (10);
|
||||
TEST_COMPARE (global2, 10);
|
||||
|
||||
int *local1 = get_local1 ();
|
||||
TEST_COMPARE (*local1, 0);
|
||||
++*local1;
|
||||
|
||||
int *local2 = get_local2 ();
|
||||
TEST_COMPARE (*local2, 0);
|
||||
++*local2;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
pthread_t thr = xpthread_create (NULL, thr_func, NULL);
|
||||
void *r = xpthread_join (thr);
|
||||
TEST_VERIFY (r == NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include <support/test-driver.c>
|
25
elf/tst-auditmod-tlsdesc.c
Normal file
25
elf/tst-auditmod-tlsdesc.c
Normal file
@ -0,0 +1,25 @@
|
||||
/* DT_AUDIT with modules with TLSDESC.
|
||||
Copyright (C) 2021 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
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <link.h>
|
||||
|
||||
unsigned int
|
||||
la_version (unsigned int version)
|
||||
{
|
||||
return LAV_CURRENT;
|
||||
}
|
Loading…
Reference in New Issue
Block a user