From: Yu-cheng Yu <yu-cheng.yu@intel.com>
To: x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
linux-mm@kvack.org, linux-arch@vger.kernel.org,
linux-api@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Andy Lutomirski <luto@kernel.org>,
Balbir Singh <bsingharora@gmail.com>,
Borislav Petkov <bp@alien8.de>,
Cyrill Gorcunov <gorcunov@gmail.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Eugene Syromiatnikov <esyr@redhat.com>,
Florian Weimer <fweimer@redhat.com>,
"H.J. Lu" <hjl.tools@gmail.com>, Jann Horn <jannh@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Kees Cook <keescook@chromium.org>,
Mike Kravetz <mike.kravetz@oracle.com>,
Nadav Amit <nadav.amit@gmail.com>,
Oleg Nesterov <oleg@redhat.com>, Pavel Machek <pavel@ucw.cz>,
Peter Zijlstra <peterz@infradead.org>,
Randy Dunlap <rdunlap@infradead.org>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
Vedvyas Shanbhogue <vedvyas.shanbhogue@intel.com>,
Dave Martin <Dave.Martin@arm.com>,
Weijiang Yang <weijiang.yang@intel.com>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Subject: [RFC PATCH 5/5] selftest/x86: Add CET quick test
Date: Thu, 21 May 2020 14:17:20 -0700 [thread overview]
Message-ID: <20200521211720.20236-6-yu-cheng.yu@intel.com> (raw)
In-Reply-To: <20200521211720.20236-1-yu-cheng.yu@intel.com>
Introduce a quick test to verify shadow stack and IBT are working.
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
---
tools/testing/selftests/x86/Makefile | 2 +-
tools/testing/selftests/x86/cet_quick_test.c | 128 +++++++++++++++++++
2 files changed, 129 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/x86/cet_quick_test.c
diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index f1bf5ab87160..26e68272117a 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -14,7 +14,7 @@ CAN_BUILD_CET := $(shell ./check_cc.sh $(CC) trivial_program.c -fcf-protection)
TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \
check_initial_reg_state sigreturn iopl ioperm \
protection_keys test_vdso test_vsyscall mov_ss_trap \
- syscall_arg_fault
+ syscall_arg_fault cet_quick_test
TARGETS_C_32BIT_ONLY := entry_from_vm86 test_syscall_vdso unwind_vdso \
test_FCMOV test_FCOMI test_FISTTP \
vdso_restorer
diff --git a/tools/testing/selftests/x86/cet_quick_test.c b/tools/testing/selftests/x86/cet_quick_test.c
new file mode 100644
index 000000000000..e84bbbcfd26f
--- /dev/null
+++ b/tools/testing/selftests/x86/cet_quick_test.c
@@ -0,0 +1,128 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Quick tests to verify Shadow Stack and IBT are working */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <ucontext.h>
+
+ucontext_t ucp;
+int result[4] = {-1, -1, -1, -1};
+int test_id;
+
+void stack_hacked(unsigned long x)
+{
+ result[test_id] = -1;
+ test_id++;
+ setcontext(&ucp);
+}
+
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+void ibt_violation(void)
+{
+#ifdef __i386__
+ asm volatile("lea 1f, %eax");
+ asm volatile("jmp *%eax");
+#else
+ asm volatile("lea 1f, %rax");
+ asm volatile("jmp *%rax");
+#endif
+ asm volatile("1:");
+ result[test_id] = -1;
+ test_id++;
+ setcontext(&ucp);
+}
+
+void shstk_violation(void)
+{
+#ifdef __i386__
+ unsigned long x = 0;
+
+ ((unsigned long *)&x)[2] = (unsigned long)stack_hacked;
+#else
+ unsigned long long x = 0;
+
+ ((unsigned long long *)&x)[2] = (unsigned long)stack_hacked;
+#endif
+}
+#pragma GCC pop_options
+
+void segv_handler(int signum, siginfo_t *si, void *uc)
+{
+ result[test_id] = 0;
+ test_id++;
+ setcontext(&ucp);
+}
+
+void user1_handler(int signum, siginfo_t *si, void *uc)
+{
+ shstk_violation();
+}
+
+void user2_handler(int signum, siginfo_t *si, void *uc)
+{
+ ibt_violation();
+}
+
+int main(int argc, char *argv[])
+{
+ struct sigaction sa;
+ int r;
+
+ r = sigemptyset(&sa.sa_mask);
+ if (r)
+ return -1;
+
+ sa.sa_flags = SA_SIGINFO;
+
+ /*
+ * Control protection fault handler
+ */
+ sa.sa_sigaction = segv_handler;
+ r = sigaction(SIGSEGV, &sa, NULL);
+ if (r)
+ return -1;
+
+ /*
+ * Handler to test Shadow stack
+ */
+ sa.sa_sigaction = user1_handler;
+ r = sigaction(SIGUSR1, &sa, NULL);
+ if (r)
+ return -1;
+
+ /*
+ * Handler to test IBT
+ */
+ sa.sa_sigaction = user2_handler;
+ r = sigaction(SIGUSR2, &sa, NULL);
+ if (r)
+ return -1;
+
+ test_id = 0;
+ r = getcontext(&ucp);
+ if (r)
+ return -1;
+
+ if (test_id == 0)
+ shstk_violation();
+ else if (test_id == 1)
+ ibt_violation();
+ else if (test_id == 2)
+ raise(SIGUSR1);
+ else if (test_id == 3)
+ raise(SIGUSR2);
+
+ r = 0;
+ printf("[%s]\tShadow stack\n", result[0] ? "FAIL":"OK");
+ r += result[0];
+ printf("[%s]\tIBT\n", result[1] ? "FAIL":"OK");
+ r += result[1];
+ printf("[%s]\tShadow stack in signal\n", result[2] ? "FAIL":"OK");
+ r += result[2];
+ printf("[%s]\tIBT in signal\n", result[3] ? "FAIL":"OK");
+ r += result[3];
+ return r;
+}
--
2.21.0
next prev parent reply other threads:[~2020-05-21 21:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 21:17 [RFC PATCH 0/5] Update selftests/x86 for CET Yu-cheng Yu
2020-05-21 21:17 ` [RFC PATCH 1/5] x86/cet/shstk: Modify ARCH_X86_CET_ALLOC_SHSTK for 32-bit address range Yu-cheng Yu
2020-05-21 22:43 ` Kees Cook
2020-05-21 21:17 ` [RFC PATCH 2/5] selftest/x86: Enable CET for selftests/x86 Yu-cheng Yu
2020-05-21 22:44 ` Kees Cook
2020-05-21 22:58 ` Yu-cheng Yu
2020-05-21 21:17 ` [RFC PATCH 3/5] selftest/x86: Fix sigreturn_64 test Yu-cheng Yu
2020-05-21 22:47 ` Kees Cook
2020-05-21 22:48 ` Kees Cook
2020-05-21 21:17 ` [RFC PATCH 4/5] selftest/x86: Fix sysret_rip with ENDBR Yu-cheng Yu
2020-05-21 21:34 ` Thomas Gleixner
2020-05-21 22:59 ` Yu-cheng Yu
2020-05-21 21:17 ` Yu-cheng Yu [this message]
2020-05-21 23:02 ` [RFC PATCH 5/5] selftest/x86: Add CET quick test Kees Cook
2020-05-21 23:23 ` Yu-cheng Yu
2020-05-22 9:28 ` Peter Zijlstra
2020-05-22 15:10 ` Yu-cheng Yu
2020-05-22 17:22 ` Kees Cook
2020-05-22 17:27 ` Peter Zijlstra
2020-05-22 17:36 ` Kees Cook
2020-05-22 18:07 ` Yu-cheng Yu
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=20200521211720.20236-6-yu-cheng.yu@intel.com \
--to=yu-cheng.yu@intel.com \
--cc=Dave.Martin@arm.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=bsingharora@gmail.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=esyr@redhat.com \
--cc=fweimer@redhat.com \
--cc=gorcunov@gmail.com \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=nadav.amit@gmail.com \
--cc=oleg@redhat.com \
--cc=pavel@ucw.cz \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
--cc=vedvyas.shanbhogue@intel.com \
--cc=weijiang.yang@intel.com \
--cc=x86@kernel.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 NNTP newsgroup(s).