From: "H.J. Lu" <hjl.tools@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Florian Weimer <fw@deneb.enyo.de>,
Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Subject: V2 [PATCH] x86: Add --enable-cet=permissive
Date: Mon, 18 May 2020 06:50:54 -0700 [thread overview]
Message-ID: <CAMe9rOrWAKoiNgy=6CqYwsW=3oGzsstKo-g_OYwm0K-tfyRUpQ@mail.gmail.com> (raw)
In-Reply-To: <616cfb77-3aa3-fcbb-dacf-a0abbec9393e@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 1501 bytes --]
On Wed, Apr 29, 2020 at 2:58 PM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
>
>
> On 29/04/2020 17:46, Florian Weimer wrote:
> > * Adhemerval Zanella via Libc-alpha:
> >
> >> On 28/04/2020 18:52, H.J. Lu via Libc-alpha wrote:
> >>> When CET is enabled, it is an error to dlopen a non CET enabled shared
> >>> library in CET enabled application. It may be desirable to make CET
> >>> permissive, that is disable CET when dlopening a non CET enabled shared
> >>> library. With the new --enable-cet=permissive configure option, CET is
> >>> disabled when dlopening a non CET enabled shared library.
> >>
> >> Does not CET already provide a tunable to make it permissive? If the idea
> >> is to enable as de-facto for a distro bootstrap, why not make it default
> >> then?
> >
> > We currently do not have a way to set a tunable for SUID binaries.
> >
> > This means that it would be necessary to disable CET at the kernel or
> > hypervisor level if the system depends on pre-CET NSS or PAM modules
> > for its operation (or something else which is ultimately
> > dlopen-based).
>
> Doesn't disable CET on some modules defeat the very security effort? If so,
> why should it be a build option on glibc?
I consider it as a transitional build option for OSVs. OSV should
use it only as the last resort. I expect we will remove this option
a few years from now when all major pieces of OS are CET enabled.
Here is the updated patch against today's master.
Thanks.
--
H.J.
[-- Attachment #2: 0001-x86-Add-enable-cet-permissive.patch --]
[-- Type: text/x-patch, Size: 14460 bytes --]
From 03f28ce66d85455a328681bbd25a33a20977e989 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 27 Apr 2020 15:44:07 -0700
Subject: [PATCH] x86: Add --enable-cet=permissive
When CET is enabled, it is an error to dlopen a non CET enabled shared
library in CET enabled application. It may be desirable to make CET
permissive, that is disable CET when dlopening a non CET enabled shared
library. With the new --enable-cet=permissive configure option, CET is
disabled when dlopening a non CET enabled shared library.
Add DEFAULT_DL_X86_CET_CONTROL to config.h.in:
/* The default value of x86 CET control. */
#define DEFAULT_DL_X86_CET_CONTROL cet_elf_property
which enable CET features based on ELF property note.
--enable-cet=permissive it to
/* The default value of x86 CET control. */
#define DEFAULT_DL_X86_CET_CONTROL cet_permissive
which enable CET features permissively.
Update tst-cet-legacy-5a, tst-cet-legacy-5b, tst-cet-legacy-6a and
tst-cet-legacy-6b to check --enable-cet and --enable-cet=permissive.
---
INSTALL | 26 +++++++++++++++-----------
config.h.in | 3 +++
manual/install.texi | 12 ++++++++----
sysdeps/unix/sysv/linux/x86/Makefile | 2 +-
sysdeps/x86/Makefile | 18 +++++++++++++-----
sysdeps/x86/configure | 21 +++++++++++----------
sysdeps/x86/configure.ac | 19 +++++++++----------
sysdeps/x86/dl-procruntime.c | 4 ++--
sysdeps/x86/tst-cet-legacy-5.c | 25 +++++++++++++++++--------
sysdeps/x86/tst-cet-legacy-6.c | 25 +++++++++++++++++--------
10 files changed, 96 insertions(+), 59 deletions(-)
diff --git a/INSTALL b/INSTALL
index b7676d1c9f..62e78725f5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -123,20 +123,24 @@ if 'CFLAGS' is specified it must enable optimization. For example:
executables (PIE) by default.
'--enable-cet'
+'--enable-cet=permissive'
Enable Intel Control-flow Enforcement Technology (CET) support.
- When the GNU C Library is built with '--enable-cet', the resulting
- library is protected with indirect branch tracking (IBT) and shadow
- stack (SHSTK). When CET is enabled, the GNU C Library is
- compatible with all existing executables and shared libraries.
- This feature is currently supported on i386, x86_64 and x32 with
- GCC 8 and binutils 2.29 or later. Note that when CET is enabled,
- the GNU C Library requires CPUs capable of multi-byte NOPs, like
- x86-64 processors as well as Intel Pentium Pro or newer.
+ When the GNU C Library is built with '--enable-cet' or
+ '--enable-cet=permissive', the resulting library is protected with
+ indirect branch tracking (IBT) and shadow stack (SHSTK). When CET
+ is enabled, the GNU C Library is compatible with all existing
+ executables and shared libraries. This feature is currently
+ supported on i386, x86_64 and x32 with GCC 8 and binutils 2.29 or
+ later. Note that when CET is enabled, the GNU C Library requires
+ CPUs capable of multi-byte NOPs, like x86-64 processors as well as
+ Intel Pentium Pro or newer. With '--enable-cet', it is an error to
+ dlopen a non CET enabled shared library in CET enabled application.
+ With '--enable-cet=permissive', CET is disabled when dlopening a
+ non CET enabled shared library in CET enabled application.
NOTE: '--enable-cet' has been tested for i686, x86_64 and x32 on
- non-CET processors. '--enable-cet' has been tested for x86_64 and
- x32 on CET SDVs, but Intel CET support hasn't been validated for
- i686.
+ non-CET processors. '--enable-cet' has been tested for i686,
+ x86_64 and x32 on CET processors.
'--disable-profile'
Don't build libraries with profiling information. You may want to
diff --git a/config.h.in b/config.h.in
index dea43df438..a63b1cc939 100644
--- a/config.h.in
+++ b/config.h.in
@@ -262,4 +262,7 @@
in i386 6 argument syscall issue). */
#define CAN_USE_REGISTER_ASM_EBP 0
+/* The default value of x86 CET control. */
+#define DEFAULT_DL_X86_CET_CONTROL cet_elf_property
+
#endif
diff --git a/manual/install.texi b/manual/install.texi
index f6d9d92317..c1e49a94fe 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -152,20 +152,24 @@ PIE. This option also implies that glibc programs and tests are created
as dynamic position independent executables (PIE) by default.
@item --enable-cet
+@itemx --enable-cet=permissive
Enable Intel Control-flow Enforcement Technology (CET) support. When
-@theglibc{} is built with @option{--enable-cet}, the resulting library
+@theglibc{} is built with @option{--enable-cet} or
+@option{--enable-cet=permissive}, the resulting library
is protected with indirect branch tracking (IBT) and shadow stack
(SHSTK)@. When CET is enabled, @theglibc{} is compatible with all
existing executables and shared libraries. This feature is currently
supported on i386, x86_64 and x32 with GCC 8 and binutils 2.29 or later.
Note that when CET is enabled, @theglibc{} requires CPUs capable of
multi-byte NOPs, like x86-64 processors as well as Intel Pentium Pro or
-newer.
+newer. With @option{--enable-cet}, it is an error to dlopen a non CET
+enabled shared library in CET enabled application. With
+@option{--enable-cet=permissive}, CET is disabled when dlopening a
+non CET enabled shared library in CET enabled application.
NOTE: @option{--enable-cet} has been tested for i686, x86_64 and x32
on non-CET processors. @option{--enable-cet} has been tested for
-x86_64 and x32 on CET SDVs, but Intel CET support hasn't been validated
-for i686.
+i686, x86_64 and x32 on CET processors.
@item --disable-profile
Don't build libraries with profiling information. You may want to use
diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile
index b23b532590..50fd018fa3 100644
--- a/sysdeps/unix/sysv/linux/x86/Makefile
+++ b/sysdeps/unix/sysv/linux/x86/Makefile
@@ -24,7 +24,7 @@ ifeq ($(subdir),setjmp)
tests += tst-saved_mask-1
endif
-ifeq ($(enable-cet),yes)
+ifneq ($(enable-cet),no)
ifeq ($(subdir),elf)
tests += tst-cet-property-1 tst-cet-property-2
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index 4ffa699e5f..beab426f67 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 b1ff281249..81cc4e80d6 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 a909b073af..8f3e1191f6 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 2c3e97952b..a3ec61b91e 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 e2e95b6749..007b30029b 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 bdbbb9075f..fdf798ee20 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)
{
--
2.26.2
next prev parent reply other threads:[~2020-05-18 13:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 21:52 [PATCH 0/3] " H.J. Lu
2020-04-28 21:52 ` [PATCH 1/3] CET: Rename CET_MAX to CET_CONTROL_MASK [BZ #25887] H.J. Lu
2020-05-16 16:37 ` PING: " H.J. Lu
2020-05-16 17:27 ` Florian Weimer
2020-05-16 23:44 ` [PATCH] x86: Move CET control to _dl_x86_feature_control " H.J. Lu
2020-05-18 7:19 ` Florian Weimer
2020-05-18 12:26 ` V2 " H.J. Lu
2020-05-18 12:36 ` Florian Weimer
2020-04-28 21:52 ` [PATCH 2/3] rtld: Get architecture specific initializer in rtld_global H.J. Lu
2020-05-16 16:38 ` PING: " H.J. Lu
2020-05-16 17:51 ` Florian Weimer
2020-05-16 18:01 ` H.J. Lu
2020-05-16 18:07 ` Florian Weimer
2020-05-16 18:24 ` V2 [PATCH] " H.J. Lu
2020-04-28 21:52 ` [PATCH 3/3] x86: Add --enable-cet=permissive H.J. Lu
2020-04-29 17:19 ` [PATCH 0/3] " Adhemerval Zanella
2020-04-29 20:29 ` H.J. Lu
2020-04-29 20:46 ` Florian Weimer
2020-04-29 21:14 ` Adhemerval Zanella
2020-05-18 13:50 ` H.J. Lu [this message]
2020-05-18 14:43 ` V2 [PATCH] " Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMe9rOrWAKoiNgy=6CqYwsW=3oGzsstKo-g_OYwm0K-tfyRUpQ@mail.gmail.com' \
--to=hjl.tools@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=fw@deneb.enyo.de \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).