aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/x86
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/x86')
-rw-r--r--sysdeps/x86/Makefile18
-rw-r--r--sysdeps/x86/configure21
-rw-r--r--sysdeps/x86/configure.ac19
-rw-r--r--sysdeps/x86/dl-procruntime.c4
-rw-r--r--sysdeps/x86/tst-cet-legacy-5.c25
-rw-r--r--sysdeps/x86/tst-cet-legacy-6.c25
6 files changed, 69 insertions, 43 deletions
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index 4ffa699..beab426 100644
--- a/sysdeps/x86/Makefile
+++ b/sysdeps/x86/Makefile
@@ -14,7 +14,7 @@ gen-as-const-headers += jmp_buf-ssp.sym
sysdep_routines += __longjmp_cancel
endif
-ifeq ($(enable-cet),yes)
+ifneq ($(enable-cet),no)
ifeq ($(subdir),elf)
sysdep-dl-routines += dl-cet
@@ -42,13 +42,21 @@ 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-5a.c += -fcf-protection -mshstk
+ifeq ($(enable-cet),permissive)
+CPPFLAGS-tst-cet-legacy-5a.c += -DCET_IS_PERMISSIVE=1
+endif
+CFLAGS-tst-cet-legacy-5b.c += -fcf-protection -mshstk
+CPPFLAGS-tst-cet-legacy-5b.c += -DCET_DISABLED_BY_ENV=1
CFLAGS-tst-cet-legacy-mod-5a.c += -fcf-protection=branch
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-6a.c += -fcf-protection -mshstk
+ifeq ($(enable-cet),permissive)
+CPPFLAGS-tst-cet-legacy-6a.c += -DCET_IS_PERMISSIVE=1
+endif
+CFLAGS-tst-cet-legacy-6b.c += -fcf-protection -mshstk
+CPPFLAGS-tst-cet-legacy-6b.c += -DCET_DISABLED_BY_ENV=1
CFLAGS-tst-cet-legacy-mod-6a.c += -fcf-protection=branch
CFLAGS-tst-cet-legacy-mod-6b.c += -fcf-protection
CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection
diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure
index b1ff281..81cc4e8 100644
--- a/sysdeps/x86/configure
+++ b/sysdeps/x86/configure
@@ -1,7 +1,7 @@
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/x86.
-if test x"$enable_cet" = xyes; then
+if test $enable_cet != no; then
# Check if CET can be enabled.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CET can be enabled" >&5
$as_echo_n "checking whether CET can be enabled... " >&6; }
@@ -27,17 +27,11 @@ EOF
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_cet_available" >&5
$as_echo "$libc_cv_x86_cet_available" >&6; }
- if test $libc_cv_x86_cet_available = yes; then
- enable_cet=yes
- else
- if test x"$enable_cet" = xdefault; then
- enable_cet=no
- else
- as_fn_error $? "$CC doesn't support CET" "$LINENO" 5
- fi
+ if test $libc_cv_x86_cet_available != yes; then
+ as_fn_error $? "$CC doesn't support CET" "$LINENO" 5
fi
fi
-if test $enable_cet = yes; then
+if test $enable_cet != no; then
# Check if assembler supports CET.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AS supports CET" >&5
$as_echo_n "checking whether $AS supports CET... " >&6; }
@@ -65,5 +59,12 @@ $as_echo "$libc_cv_x86_cet_as" >&6; }
as_fn_error $? "$AS doesn't support CET" "$LINENO" 5
fi
fi
+if test $enable_cet = yes; then
+ $as_echo "#define DEFAULT_DL_X86_CET_CONTROL cet_elf_property" >>confdefs.h
+
+elif test $enable_cet = permissive; then
+ $as_echo "#define DEFAULT_DL_X86_CET_CONTROL cet_permissive" >>confdefs.h
+
+fi
config_vars="$config_vars
enable-cet = $enable_cet"
diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac
index a909b07..8f3e119 100644
--- a/sysdeps/x86/configure.ac
+++ b/sysdeps/x86/configure.ac
@@ -1,7 +1,7 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/x86.
-if test x"$enable_cet" = xyes; then
+if test $enable_cet != no; then
# Check if CET can be enabled.
AC_CACHE_CHECK(whether CET can be enabled,
libc_cv_x86_cet_available, [dnl
@@ -16,17 +16,11 @@ EOF
libc_cv_x86_cet_available=no
fi
rm -rf conftest*])
- if test $libc_cv_x86_cet_available = yes; then
- enable_cet=yes
- else
- if test x"$enable_cet" = xdefault; then
- enable_cet=no
- else
- AC_MSG_ERROR([$CC doesn't support CET])
- fi
+ if test $libc_cv_x86_cet_available != yes; then
+ AC_MSG_ERROR([$CC doesn't support CET])
fi
fi
-if test $enable_cet = yes; then
+if test $enable_cet != no; then
# Check if assembler supports CET.
AC_CACHE_CHECK(whether $AS supports CET,
libc_cv_x86_cet_as, [dnl
@@ -43,4 +37,9 @@ EOF
AC_MSG_ERROR([$AS doesn't support CET])
fi
fi
+if test $enable_cet = yes; then
+ AC_DEFINE(DEFAULT_DL_X86_CET_CONTROL, cet_elf_property)
+elif test $enable_cet = permissive; then
+ AC_DEFINE(DEFAULT_DL_X86_CET_CONTROL, cet_permissive)
+fi
LIBC_CONFIG_VAR([enable-cet], [$enable_cet])
diff --git a/sysdeps/x86/dl-procruntime.c b/sysdeps/x86/dl-procruntime.c
index 2c3e979..a3ec61b 100644
--- a/sysdeps/x86/dl-procruntime.c
+++ b/sysdeps/x86/dl-procruntime.c
@@ -65,8 +65,8 @@ PROCINFO_CLASS struct dl_x86_feature_control _dl_x86_feature_control
# endif
# ifndef PROCINFO_DECL
= {
- .ibt = cet_elf_property,
- .shstk = cet_elf_property
+ .ibt = DEFAULT_DL_X86_CET_CONTROL,
+ .shstk = DEFAULT_DL_X86_CET_CONTROL,
}
# endif
# if !defined SHARED || defined PROCINFO_DECL
diff --git a/sysdeps/x86/tst-cet-legacy-5.c b/sysdeps/x86/tst-cet-legacy-5.c
index e2e95b6..007b300 100644
--- a/sysdeps/x86/tst-cet-legacy-5.c
+++ b/sysdeps/x86/tst-cet-legacy-5.c
@@ -22,6 +22,14 @@
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
+#include <x86intrin.h>
+#include <support/check.h>
+
+#if defined CET_IS_PERMISSIVE || defined CET_DISABLED_BY_ENV
+# define CET_MAYBE_DISABLED 1
+#else
+# define CET_MAYBE_DISABLED 0
+#endif
static void
do_test_1 (const char *modname, bool fail)
@@ -32,24 +40,25 @@ do_test_1 (const char *modname, bool fail)
h = dlopen (modname, RTLD_LAZY);
if (h == NULL)
{
+ const char *err = dlerror ();
if (fail)
{
- const char *err = dlerror ();
if (strstr (err, "rebuild shared object with SHSTK support enabled")
== NULL)
- {
- printf ("incorrect dlopen '%s' error: %s\n", modname,
- err);
- exit (1);
- }
+ FAIL_EXIT1 ("incorrect dlopen '%s' error: %s\n", modname, err);
return;
}
- printf ("cannot open '%s': %s\n", modname, dlerror ());
- exit (1);
+ FAIL_EXIT1 ("cannot open '%s': %s\n", modname, err);
}
+ /* NB: dlopen should never fail on non-CET platforms. If SHSTK is
+ disabled, assuming IBT is also disabled. */
+ bool cet_enabled = _get_ssp () != 0 && !CET_MAYBE_DISABLED;
+ if (fail && cet_enabled)
+ FAIL_EXIT1 ("dlopen should have failed\n");
+
fp = dlsym (h, "test");
if (fp == NULL)
{
diff --git a/sysdeps/x86/tst-cet-legacy-6.c b/sysdeps/x86/tst-cet-legacy-6.c
index bdbbb90..fdf798e 100644
--- a/sysdeps/x86/tst-cet-legacy-6.c
+++ b/sysdeps/x86/tst-cet-legacy-6.c
@@ -22,6 +22,14 @@
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
+#include <x86intrin.h>
+#include <support/check.h>
+
+#if defined CET_IS_PERMISSIVE || defined CET_DISABLED_BY_ENV
+# define CET_MAYBE_DISABLED 1
+#else
+# define CET_MAYBE_DISABLED 0
+#endif
static void
do_test_1 (const char *modname, bool fail)
@@ -32,24 +40,25 @@ do_test_1 (const char *modname, bool fail)
h = dlopen (modname, RTLD_LAZY);
if (h == NULL)
{
+ const char *err = dlerror ();
if (fail)
{
- const char *err = dlerror ();
if (strstr (err, "rebuild shared object with SHSTK support enabled")
== NULL)
- {
- printf ("incorrect dlopen '%s' error: %s\n", modname,
- err);
- exit (1);
- }
+ FAIL_EXIT1 ("incorrect dlopen '%s' error: %s\n", modname, err);
return;
}
- printf ("cannot open '%s': %s\n", modname, dlerror ());
- exit (1);
+ FAIL_EXIT1 ("cannot open '%s': %s\n", modname, err);
}
+ /* NB: dlopen should never fail on non-CET platforms. If SHSTK is
+ disabled, assuming IBT is also disabled. */
+ bool cet_enabled = _get_ssp () != 0 && !CET_MAYBE_DISABLED;
+ if (fail && cet_enabled)
+ FAIL_EXIT1 ("dlopen should have failed\n");
+
fp = dlsym (h, "test");
if (fp == NULL)
{
generated by cgit v1.1 at 2024-11-22 08:17:40 +0000