| Message ID | 20231216165325.2584919-6-hjl.tools@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | x86/cet: Update CET kernel interface | expand |
On Sat, Dec 16, 2023 at 8:53 AM H.J. Lu <hjl.tools@gmail.com> wrote: > > Verify that CPU_FEATURE_ACTIVE (SHSTK) works properly when CET is > disabled. > --- > sysdeps/x86/Makefile | 5 +++++ > sysdeps/x86/tst-cet-legacy-10a-static.c | 2 ++ > sysdeps/x86/tst-cet-legacy-10a.c | 2 ++ > 3 files changed, 9 insertions(+) > create mode 100644 sysdeps/x86/tst-cet-legacy-10a-static.c > create mode 100644 sysdeps/x86/tst-cet-legacy-10a.c > > diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile > index a41598adf9..23f3ac1430 100644 > --- a/sysdeps/x86/Makefile > +++ b/sysdeps/x86/Makefile > @@ -156,10 +156,13 @@ tests += \ > tst-cet-legacy-9-static \ > tst-cet-legacy-10 \ > tst-cet-legacy-10-static \ > + tst-cet-legacy-10a \ > + tst-cet-legacy-10a-static \ > # tests > tests-static += \ > tst-cet-legacy-9-static \ > tst-cet-legacy-10-static \ > + tst-cet-legacy-10a-static \ > # tests-static > tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) > > @@ -226,6 +229,8 @@ CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection > CFLAGS-tst-cet-legacy-7.c += -fcf-protection=none > CFLAGS-tst-cet-legacy-10.c += -mshstk > CFLAGS-tst-cet-legacy-10-static.c += -mshstk > +CFLAGS-tst-cet-legacy-10a.c += -fcf-protection=none > +CFLAGS-tst-cet-legacy-10a-static.c += -fcf-protection=none > > CFLAGS-tst-shstk-legacy-1a.c += -fcf-protection=none > CFLAGS-tst-shstk-legacy-1a-static.c += -fcf-protection=none > diff --git a/sysdeps/x86/tst-cet-legacy-10a-static.c b/sysdeps/x86/tst-cet-legacy-10a-static.c > new file mode 100644 > index 0000000000..05073a5d1e > --- /dev/null > +++ b/sysdeps/x86/tst-cet-legacy-10a-static.c > @@ -0,0 +1,2 @@ > +#pragma GCC target ("shstk") > +#include "tst-cet-legacy-10.c" > diff --git a/sysdeps/x86/tst-cet-legacy-10a.c b/sysdeps/x86/tst-cet-legacy-10a.c > new file mode 100644 > index 0000000000..05073a5d1e > --- /dev/null > +++ b/sysdeps/x86/tst-cet-legacy-10a.c > @@ -0,0 +1,2 @@ > +#pragma GCC target ("shstk") > +#include "tst-cet-legacy-10.c" > -- > 2.43.0 > I will check it in tomorrow if there is no objection.
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index a41598adf9..23f3ac1430 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -156,10 +156,13 @@ tests += \ tst-cet-legacy-9-static \ tst-cet-legacy-10 \ tst-cet-legacy-10-static \ + tst-cet-legacy-10a \ + tst-cet-legacy-10a-static \ # tests tests-static += \ tst-cet-legacy-9-static \ tst-cet-legacy-10-static \ + tst-cet-legacy-10a-static \ # tests-static tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) @@ -226,6 +229,8 @@ CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection CFLAGS-tst-cet-legacy-7.c += -fcf-protection=none CFLAGS-tst-cet-legacy-10.c += -mshstk CFLAGS-tst-cet-legacy-10-static.c += -mshstk +CFLAGS-tst-cet-legacy-10a.c += -fcf-protection=none +CFLAGS-tst-cet-legacy-10a-static.c += -fcf-protection=none CFLAGS-tst-shstk-legacy-1a.c += -fcf-protection=none CFLAGS-tst-shstk-legacy-1a-static.c += -fcf-protection=none diff --git a/sysdeps/x86/tst-cet-legacy-10a-static.c b/sysdeps/x86/tst-cet-legacy-10a-static.c new file mode 100644 index 0000000000..05073a5d1e --- /dev/null +++ b/sysdeps/x86/tst-cet-legacy-10a-static.c @@ -0,0 +1,2 @@ +#pragma GCC target ("shstk") +#include "tst-cet-legacy-10.c" diff --git a/sysdeps/x86/tst-cet-legacy-10a.c b/sysdeps/x86/tst-cet-legacy-10a.c new file mode 100644 index 0000000000..05073a5d1e --- /dev/null +++ b/sysdeps/x86/tst-cet-legacy-10a.c @@ -0,0 +1,2 @@ +#pragma GCC target ("shstk") +#include "tst-cet-legacy-10.c"