mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 20:40:05 +00:00
Call _dl_open_check after relocation [BZ #24259]
This is a workaround for [BZ #20839] which doesn't remove the NODELETE object when _dl_open_check throws an exception. Move it after relocation in dl_open_worker to avoid leaving the NODELETE object mapped without relocation. [BZ #24259] * elf/dl-open.c (dl_open_worker): Call _dl_open_check after relocation. * sysdeps/x86/Makefile (tests): Add tst-cet-legacy-5a, tst-cet-legacy-5b, tst-cet-legacy-6a and tst-cet-legacy-6b. (modules-names): Add tst-cet-legacy-mod-5a, tst-cet-legacy-mod-5b, tst-cet-legacy-mod-5c, tst-cet-legacy-mod-6a, tst-cet-legacy-mod-6b and tst-cet-legacy-mod-6c. (CFLAGS-tst-cet-legacy-5a.c): New. (CFLAGS-tst-cet-legacy-5b.c): Likewise. (CFLAGS-tst-cet-legacy-mod-5a.c): Likewise. (CFLAGS-tst-cet-legacy-mod-5b.c): Likewise. (CFLAGS-tst-cet-legacy-mod-5c.c): Likewise. (CFLAGS-tst-cet-legacy-6a.c): Likewise. (CFLAGS-tst-cet-legacy-6b.c): Likewise. (CFLAGS-tst-cet-legacy-mod-6a.c): Likewise. (CFLAGS-tst-cet-legacy-mod-6b.c): Likewise. (CFLAGS-tst-cet-legacy-mod-6c.c): Likewise. ($(objpfx)tst-cet-legacy-5a): Likewise. ($(objpfx)tst-cet-legacy-5a.out): Likewise. ($(objpfx)tst-cet-legacy-mod-5a.so): Likewise. ($(objpfx)tst-cet-legacy-mod-5b.so): Likewise. ($(objpfx)tst-cet-legacy-5b): Likewise. ($(objpfx)tst-cet-legacy-5b.out): Likewise. (tst-cet-legacy-5b-ENV): Likewise. ($(objpfx)tst-cet-legacy-6a): Likewise. ($(objpfx)tst-cet-legacy-6a.out): Likewise. ($(objpfx)tst-cet-legacy-mod-6a.so): Likewise. ($(objpfx)tst-cet-legacy-mod-6b.so): Likewise. ($(objpfx)tst-cet-legacy-6b): Likewise. ($(objpfx)tst-cet-legacy-6b.out): Likewise. (tst-cet-legacy-6b-ENV): Likewise. * sysdeps/x86/tst-cet-legacy-5.c: New file. * sysdeps/x86/tst-cet-legacy-5a.c: Likewise. * sysdeps/x86/tst-cet-legacy-5b.c: Likewise. * sysdeps/x86/tst-cet-legacy-6.c: Likewise. * sysdeps/x86/tst-cet-legacy-6a.c: Likewise. * sysdeps/x86/tst-cet-legacy-6b.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-5.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-5a.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-5b.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-5c.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-6.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-6a.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-6b.c: Likewise. * sysdeps/x86/tst-cet-legacy-mod-6c.c: Likewise.
This commit is contained in:
parent
3db85a9814
commit
d0093c5cef
49
ChangeLog
49
ChangeLog
@ -1,3 +1,52 @@
|
||||
2019-07-01 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
[BZ #24259]
|
||||
* elf/dl-open.c (dl_open_worker): Call _dl_open_check after
|
||||
relocation.
|
||||
* sysdeps/x86/Makefile (tests): Add tst-cet-legacy-5a,
|
||||
tst-cet-legacy-5b, tst-cet-legacy-6a and tst-cet-legacy-6b.
|
||||
(modules-names): Add tst-cet-legacy-mod-5a, tst-cet-legacy-mod-5b,
|
||||
tst-cet-legacy-mod-5c, tst-cet-legacy-mod-6a, tst-cet-legacy-mod-6b
|
||||
and tst-cet-legacy-mod-6c.
|
||||
(CFLAGS-tst-cet-legacy-5a.c): New.
|
||||
(CFLAGS-tst-cet-legacy-5b.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-mod-5a.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-mod-5b.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-mod-5c.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-6a.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-6b.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-mod-6a.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-mod-6b.c): Likewise.
|
||||
(CFLAGS-tst-cet-legacy-mod-6c.c): Likewise.
|
||||
($(objpfx)tst-cet-legacy-5a): Likewise.
|
||||
($(objpfx)tst-cet-legacy-5a.out): Likewise.
|
||||
($(objpfx)tst-cet-legacy-mod-5a.so): Likewise.
|
||||
($(objpfx)tst-cet-legacy-mod-5b.so): Likewise.
|
||||
($(objpfx)tst-cet-legacy-5b): Likewise.
|
||||
($(objpfx)tst-cet-legacy-5b.out): Likewise.
|
||||
(tst-cet-legacy-5b-ENV): Likewise.
|
||||
($(objpfx)tst-cet-legacy-6a): Likewise.
|
||||
($(objpfx)tst-cet-legacy-6a.out): Likewise.
|
||||
($(objpfx)tst-cet-legacy-mod-6a.so): Likewise.
|
||||
($(objpfx)tst-cet-legacy-mod-6b.so): Likewise.
|
||||
($(objpfx)tst-cet-legacy-6b): Likewise.
|
||||
($(objpfx)tst-cet-legacy-6b.out): Likewise.
|
||||
(tst-cet-legacy-6b-ENV): Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-5.c: New file.
|
||||
* sysdeps/x86/tst-cet-legacy-5a.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-5b.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-6.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-6a.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-6b.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-5.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-5a.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-5b.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-5c.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-6.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-6a.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-6b.c: Likewise.
|
||||
* sysdeps/x86/tst-cet-legacy-mod-6c.c: Likewise.
|
||||
|
||||
2019-06-30 Paul A. Clarke <pc@us.ibm.com>
|
||||
|
||||
* sysdeps/powerpc/bits/fenvinline.h (__fegetround): Use
|
||||
|
@ -292,8 +292,6 @@ dl_open_worker (void *a)
|
||||
_dl_debug_state ();
|
||||
LIBC_PROBE (map_complete, 3, args->nsid, r, new);
|
||||
|
||||
_dl_open_check (new);
|
||||
|
||||
/* Print scope information. */
|
||||
if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES))
|
||||
_dl_show_scope (new, 0);
|
||||
@ -366,6 +364,12 @@ dl_open_worker (void *a)
|
||||
_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
|
||||
}
|
||||
|
||||
/* NB: Workaround for [BZ #20839] which doesn't remove the NODELETE
|
||||
object when _dl_open_check throws an exception. Move it after
|
||||
relocation to avoid leaving the NODELETE object mapped without
|
||||
relocation. */
|
||||
_dl_open_check (new);
|
||||
|
||||
/* If the file is not loaded now as a dependency, add the search
|
||||
list of the newly loaded object to the scope. */
|
||||
bool any_tls = false;
|
||||
|
@ -19,13 +19,18 @@ ifeq ($(subdir),elf)
|
||||
sysdep-dl-routines += dl-cet
|
||||
|
||||
tests += tst-cet-legacy-1 tst-cet-legacy-1a tst-cet-legacy-2 \
|
||||
tst-cet-legacy-2a tst-cet-legacy-3 tst-cet-legacy-4
|
||||
tst-cet-legacy-2a tst-cet-legacy-3 tst-cet-legacy-4 \
|
||||
tst-cet-legacy-5a tst-cet-legacy-6a
|
||||
tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd)
|
||||
ifneq (no,$(have-tunables))
|
||||
tests += tst-cet-legacy-4a tst-cet-legacy-4b tst-cet-legacy-4c
|
||||
tests += tst-cet-legacy-4a tst-cet-legacy-4b tst-cet-legacy-4c \
|
||||
tst-cet-legacy-5b tst-cet-legacy-6b
|
||||
endif
|
||||
modules-names += tst-cet-legacy-mod-1 tst-cet-legacy-mod-2 \
|
||||
tst-cet-legacy-mod-4
|
||||
tst-cet-legacy-mod-4 tst-cet-legacy-mod-5a \
|
||||
tst-cet-legacy-mod-5b tst-cet-legacy-mod-5c \
|
||||
tst-cet-legacy-mod-6a tst-cet-legacy-mod-6b \
|
||||
tst-cet-legacy-mod-6c
|
||||
|
||||
CFLAGS-tst-cet-legacy-2.c += -fcf-protection=branch
|
||||
CFLAGS-tst-cet-legacy-2a.c += -fcf-protection
|
||||
@ -36,6 +41,16 @@ CFLAGS-tst-cet-legacy-4.c += -fcf-protection=branch
|
||||
CFLAGS-tst-cet-legacy-4a.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-4b.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-mod-4.c += -fcf-protection=none
|
||||
CFLAGS-tst-cet-legacy-5a.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-5b.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-mod-5a.c += -fcf-protection=none
|
||||
CFLAGS-tst-cet-legacy-mod-5b.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-mod-5c.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-6a.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-6b.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-mod-6a.c += -fcf-protection=none
|
||||
CFLAGS-tst-cet-legacy-mod-6b.c += -fcf-protection
|
||||
CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection
|
||||
|
||||
$(objpfx)tst-cet-legacy-1: $(objpfx)tst-cet-legacy-mod-1.so \
|
||||
$(objpfx)tst-cet-legacy-mod-2.so
|
||||
@ -47,6 +62,17 @@ $(objpfx)tst-cet-legacy-2a: $(objpfx)tst-cet-legacy-mod-2.so $(libdl)
|
||||
$(objpfx)tst-cet-legacy-2a.out: $(objpfx)tst-cet-legacy-mod-1.so
|
||||
$(objpfx)tst-cet-legacy-4: $(libdl)
|
||||
$(objpfx)tst-cet-legacy-4.out: $(objpfx)tst-cet-legacy-mod-4.so
|
||||
$(objpfx)tst-cet-legacy-5a: $(libdl)
|
||||
$(objpfx)tst-cet-legacy-5a.out: $(objpfx)tst-cet-legacy-mod-5a.so \
|
||||
$(objpfx)tst-cet-legacy-mod-5b.so
|
||||
$(objpfx)tst-cet-legacy-mod-5a.so: $(objpfx)tst-cet-legacy-mod-5c.so
|
||||
$(objpfx)tst-cet-legacy-mod-5b.so: $(objpfx)tst-cet-legacy-mod-5c.so
|
||||
$(objpfx)tst-cet-legacy-6a: $(libdl)
|
||||
$(objpfx)tst-cet-legacy-6a.out: $(objpfx)tst-cet-legacy-mod-6a.so \
|
||||
$(objpfx)tst-cet-legacy-mod-6b.so
|
||||
$(objpfx)tst-cet-legacy-mod-6a.so: $(objpfx)tst-cet-legacy-mod-6c.so
|
||||
$(objpfx)tst-cet-legacy-mod-6b.so: $(objpfx)tst-cet-legacy-mod-6c.so
|
||||
LDFLAGS-tst-cet-legacy-mod-6c.so = -Wl,--enable-new-dtags,-z,nodelete
|
||||
ifneq (no,$(have-tunables))
|
||||
$(objpfx)tst-cet-legacy-4a: $(libdl)
|
||||
$(objpfx)tst-cet-legacy-4a.out: $(objpfx)tst-cet-legacy-mod-4.so
|
||||
@ -57,6 +83,14 @@ tst-cet-legacy-4b-ENV = GLIBC_TUNABLES=glibc.cpu.x86_shstk=on
|
||||
$(objpfx)tst-cet-legacy-4c: $(libdl)
|
||||
$(objpfx)tst-cet-legacy-4c.out: $(objpfx)tst-cet-legacy-mod-4.so
|
||||
tst-cet-legacy-4c-ENV = GLIBC_TUNABLES=glibc.cpu.x86_shstk=off
|
||||
$(objpfx)tst-cet-legacy-5b: $(libdl)
|
||||
$(objpfx)tst-cet-legacy-5b.out: $(objpfx)tst-cet-legacy-mod-5a.so \
|
||||
$(objpfx)tst-cet-legacy-mod-5b.so
|
||||
tst-cet-legacy-5b-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-IBT,-SHSTK
|
||||
$(objpfx)tst-cet-legacy-6b: $(libdl)
|
||||
$(objpfx)tst-cet-legacy-6b.out: $(objpfx)tst-cet-legacy-mod-6a.so \
|
||||
$(objpfx)tst-cet-legacy-mod-6b.so
|
||||
tst-cet-legacy-6b-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-IBT,-SHSTK
|
||||
endif
|
||||
endif
|
||||
|
||||
|
76
sysdeps/x86/tst-cet-legacy-5.c
Normal file
76
sysdeps/x86/tst-cet-legacy-5.c
Normal file
@ -0,0 +1,76 @@
|
||||
/* Check compatibility of CET-enabled executable with dlopened legacy
|
||||
shared object.
|
||||
Copyright (C) 2019 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 <dlfcn.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
|
||||
static void
|
||||
do_test_1 (const char *modname, bool fail)
|
||||
{
|
||||
int (*fp) (void);
|
||||
void *h;
|
||||
|
||||
h = dlopen (modname, RTLD_LAZY);
|
||||
if (h == NULL)
|
||||
{
|
||||
if (fail)
|
||||
{
|
||||
const char *err = dlerror ();
|
||||
if (strstr (err, "shadow stack isn't enabled") == NULL)
|
||||
{
|
||||
printf ("incorrect dlopen '%s' error: %s\n", modname,
|
||||
dlerror ());
|
||||
exit (1);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
printf ("cannot open '%s': %s\n", modname, dlerror ());
|
||||
exit (1);
|
||||
}
|
||||
|
||||
fp = dlsym (h, "test");
|
||||
if (fp == NULL)
|
||||
{
|
||||
printf ("cannot get symbol 'test': %s\n", dlerror ());
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (fp () != 0)
|
||||
{
|
||||
puts ("test () != 0");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
dlclose (h);
|
||||
}
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
do_test_1 ("tst-cet-legacy-mod-5a.so", true);
|
||||
do_test_1 ("tst-cet-legacy-mod-5b.so", false);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include <support/test-driver.c>
|
1
sysdeps/x86/tst-cet-legacy-5a.c
Normal file
1
sysdeps/x86/tst-cet-legacy-5a.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-5.c"
|
1
sysdeps/x86/tst-cet-legacy-5b.c
Normal file
1
sysdeps/x86/tst-cet-legacy-5b.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-5.c"
|
76
sysdeps/x86/tst-cet-legacy-6.c
Normal file
76
sysdeps/x86/tst-cet-legacy-6.c
Normal file
@ -0,0 +1,76 @@
|
||||
/* Check compatibility of CET-enabled executable with dlopened legacy
|
||||
shared object.
|
||||
Copyright (C) 2019 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 <dlfcn.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
|
||||
static void
|
||||
do_test_1 (const char *modname, bool fail)
|
||||
{
|
||||
int (*fp) (void);
|
||||
void *h;
|
||||
|
||||
h = dlopen (modname, RTLD_LAZY);
|
||||
if (h == NULL)
|
||||
{
|
||||
if (fail)
|
||||
{
|
||||
const char *err = dlerror ();
|
||||
if (strstr (err, "shadow stack isn't enabled") == NULL)
|
||||
{
|
||||
printf ("incorrect dlopen '%s' error: %s\n", modname,
|
||||
dlerror ());
|
||||
exit (1);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
printf ("cannot open '%s': %s\n", modname, dlerror ());
|
||||
exit (1);
|
||||
}
|
||||
|
||||
fp = dlsym (h, "test");
|
||||
if (fp == NULL)
|
||||
{
|
||||
printf ("cannot get symbol 'test': %s\n", dlerror ());
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (fp () != 0)
|
||||
{
|
||||
puts ("test () != 0");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
dlclose (h);
|
||||
}
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
do_test_1 ("tst-cet-legacy-mod-6a.so", true);
|
||||
do_test_1 ("tst-cet-legacy-mod-6b.so", false);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include <support/test-driver.c>
|
1
sysdeps/x86/tst-cet-legacy-6a.c
Normal file
1
sysdeps/x86/tst-cet-legacy-6a.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-6.c"
|
1
sysdeps/x86/tst-cet-legacy-6b.c
Normal file
1
sysdeps/x86/tst-cet-legacy-6b.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-6.c"
|
31
sysdeps/x86/tst-cet-legacy-mod-5.c
Normal file
31
sysdeps/x86/tst-cet-legacy-mod-5.c
Normal file
@ -0,0 +1,31 @@
|
||||
/* Check compatibility of CET-enabled executable with dlopened legacy
|
||||
shared object.
|
||||
Copyright (C) 2019 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 <error.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
extern void foo (void);
|
||||
|
||||
int
|
||||
test (void)
|
||||
{
|
||||
foo ();
|
||||
return 0;
|
||||
}
|
1
sysdeps/x86/tst-cet-legacy-mod-5a.c
Normal file
1
sysdeps/x86/tst-cet-legacy-mod-5a.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-mod-5.c"
|
1
sysdeps/x86/tst-cet-legacy-mod-5b.c
Normal file
1
sysdeps/x86/tst-cet-legacy-mod-5b.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-mod-5.c"
|
36
sysdeps/x86/tst-cet-legacy-mod-5c.c
Normal file
36
sysdeps/x86/tst-cet-legacy-mod-5c.c
Normal file
@ -0,0 +1,36 @@
|
||||
/* Check compatibility of CET-enabled executable with dlopened legacy
|
||||
shared object.
|
||||
Copyright (C) 2019 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 <stdlib.h>
|
||||
|
||||
static int called = 0;
|
||||
|
||||
static void
|
||||
__attribute__ ((constructor))
|
||||
init (void)
|
||||
{
|
||||
called = 1;
|
||||
}
|
||||
|
||||
void
|
||||
foo (void)
|
||||
{
|
||||
if (!called)
|
||||
abort ();
|
||||
}
|
31
sysdeps/x86/tst-cet-legacy-mod-6.c
Normal file
31
sysdeps/x86/tst-cet-legacy-mod-6.c
Normal file
@ -0,0 +1,31 @@
|
||||
/* Check compatibility of CET-enabled executable with dlopened legacy
|
||||
shared object.
|
||||
Copyright (C) 2019 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 <error.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
extern void foo (void);
|
||||
|
||||
int
|
||||
test (void)
|
||||
{
|
||||
foo ();
|
||||
return 0;
|
||||
}
|
1
sysdeps/x86/tst-cet-legacy-mod-6a.c
Normal file
1
sysdeps/x86/tst-cet-legacy-mod-6a.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-mod-6.c"
|
1
sysdeps/x86/tst-cet-legacy-mod-6b.c
Normal file
1
sysdeps/x86/tst-cet-legacy-mod-6b.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-mod-6.c"
|
36
sysdeps/x86/tst-cet-legacy-mod-6c.c
Normal file
36
sysdeps/x86/tst-cet-legacy-mod-6c.c
Normal file
@ -0,0 +1,36 @@
|
||||
/* Check compatibility of CET-enabled executable with dlopened legacy
|
||||
shared object.
|
||||
Copyright (C) 2019 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 <stdlib.h>
|
||||
|
||||
static int called = 0;
|
||||
|
||||
static void
|
||||
__attribute__ ((constructor))
|
||||
init (void)
|
||||
{
|
||||
called = 1;
|
||||
}
|
||||
|
||||
void
|
||||
foo (void)
|
||||
{
|
||||
if (!called)
|
||||
abort ();
|
||||
}
|
1
sysdeps/x86/tst-cet-legacy-mod-6d.c
Normal file
1
sysdeps/x86/tst-cet-legacy-mod-6d.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-cet-legacy-mod-6c.c"
|
Loading…
Reference in New Issue
Block a user