From: "H.J. Lu" <hjl.tools@gmail.com>
To: libc-alpha@sourceware.org
Cc: Carlos O'Donell <carlos@redhat.com>
Subject: [PATCH 23/23] x86-64: Add endbr64 to tst-quadmod[12].S
Date: Tue, 08 May 2018 20:40:00 -0000 [thread overview]
Message-ID: <20180508204021.31845-24-hjl.tools@gmail.com> (raw)
In-Reply-To: <20180508204021.31845-1-hjl.tools@gmail.com>
Add endbr64 to tst-quadmod1.S and tst-quadmod2.S so that func and foo
can be called indirectly.
* sysdeps/x86_64/tst-quadmod1.S (func): Add endbr64 if IBT is
enabled.
(foo): Likewise.
* sysdeps/x86_64/tst-quadmod2.S (func) : Likewise.
(foo): Likewise.
---
sysdeps/x86_64/tst-quadmod1.S | 6 ++++++
sysdeps/x86_64/tst-quadmod2.S | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/sysdeps/x86_64/tst-quadmod1.S b/sysdeps/x86_64/tst-quadmod1.S
index 26f2f1b599..c60f9dc89d 100644
--- a/sysdeps/x86_64/tst-quadmod1.S
+++ b/sysdeps/x86_64/tst-quadmod1.S
@@ -28,6 +28,9 @@
.type func, @function
func:
.cfi_startproc
+#if defined __CET__ && (__CET__ & 1) != 0
+ endbr64
+#endif
xorl %edi, %edi
jmp exit@PLT
.cfi_endproc
@@ -37,6 +40,9 @@ func:
foo:
.cfi_startproc
.cfi_def_cfa_register 6
+#if defined __CET__ && (__CET__ & 1) != 0
+ endbr64
+#endif
movq .Ljmp(%rip), %rax
subq $BIAS, %rax
jmp *%rax
diff --git a/sysdeps/x86_64/tst-quadmod2.S b/sysdeps/x86_64/tst-quadmod2.S
index e923adf672..af03444d4f 100644
--- a/sysdeps/x86_64/tst-quadmod2.S
+++ b/sysdeps/x86_64/tst-quadmod2.S
@@ -27,6 +27,9 @@
.type func, @function
func:
.cfi_startproc
+#if defined __CET__ && (__CET__ & 1) != 0
+ endbr64
+#endif
xorl %edi, %edi
jmp exit@PLT
.cfi_endproc
@@ -36,6 +39,9 @@ func:
foo:
.cfi_startproc
.cfi_def_cfa_register 6
+#if defined __CET__ && (__CET__ & 1) != 0
+ endbr64
+#endif
movq .Ljmp(%rip), %rax
subq $BIAS, %rax
jmp *%rax
--
2.17.0
next prev parent reply other threads:[~2018-05-08 20:40 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-08 20:40 [PATCH 00/23] CET: Prepare for CET enabling H.J. Lu
2018-05-08 20:40 ` [PATCH 06/23] x86-64: Add _CET_ENDBR to STRCMP_SSE42 H.J. Lu
2018-05-08 20:40 ` [PATCH 18/23] i386: Use _CET_NOTRACK in memcpy-ssse3-rep.S H.J. Lu
2018-05-08 20:40 ` [PATCH 09/23] x86_64: Use _CET_NOTRACK in strcmp.S H.J. Lu
2018-05-08 20:40 ` [PATCH 01/23] x86: Add feature_1 to tcbhead_t [BZ #22563] H.J. Lu
2018-05-16 14:28 ` Florian Weimer
2018-05-08 20:40 ` [PATCH 03/23] x86: Support IBT and SHSTK in Intel CET [BZ #21598] H.J. Lu
2018-05-08 21:03 ` Joseph Myers
2018-05-08 21:05 ` Joseph Myers
2018-05-09 21:31 ` H.J. Lu
2018-05-08 20:40 ` [PATCH 11/23] x86-64: Use _CET_NOTRACK in strcmp-sse42.S H.J. Lu
2018-05-08 20:40 ` H.J. Lu [this message]
2018-05-08 20:40 ` [PATCH 02/23] x86: Support shadow stack pointer in setjmp/longjmp H.J. Lu
2018-05-08 20:40 ` [PATCH 05/23] x86: Add _CET_ENDBR to functions in dl-tlsdesc.S H.J. Lu
2018-05-08 20:40 ` [PATCH 17/23] i386: Use _CET_NOTRACK in memcmp-sse4.S H.J. Lu
2018-05-08 20:40 ` [PATCH 19/23] i386: Use _CET_NOTRACK in memcpy-ssse3.S H.J. Lu
2018-05-08 20:40 ` [PATCH 08/23] x86: Update vfork to pop shadow stack H.J. Lu
2018-05-08 20:40 ` [PATCH 12/23] x86-64: Use _CET_NOTRACK in memcpy-ssse3-back.S H.J. Lu
2018-05-08 20:40 ` [PATCH 14/23] x86-64: Use _CET_NOTRACK in memcpy-ssse3.S H.J. Lu
2018-05-08 20:40 ` [PATCH 10/23] x86-64: Use _CET_NOTRACK in strcpy-sse2-unaligned.S H.J. Lu
2018-05-08 20:41 ` [PATCH 15/23] i386: Use _CET_NOTRACK in i686/memcmp.S H.J. Lu
2018-05-08 20:41 ` [PATCH 13/23] x86-64: Use _CET_NOTRACK in memcmp-sse4.S H.J. Lu
2018-05-08 20:41 ` [PATCH 22/23] i386: Use _CET_NOTRACK in memset-sse2-rep.S H.J. Lu
2018-05-08 20:41 ` [PATCH 20/23] i386: Use _CET_NOTRACK in strcpy-sse2.S H.J. Lu
2018-05-08 20:41 ` [PATCH 21/23] i386: Use _CET_NOTRACK in strcat-sse2.S H.J. Lu
2018-05-08 20:41 ` [PATCH 16/23] i386: Use _CET_NOTRACK in memset-sse2.S H.J. Lu
2018-05-08 20:41 ` [PATCH 07/23] i386: Add _CET_ENDBR to indirect jump targets in add_n.S/sub_n.S H.J. Lu
2018-05-08 20:41 ` [PATCH 04/23] x86: Add _CET_ENDBR to functions in crti.S H.J. Lu
2018-05-08 20:58 ` [PATCH 00/23] CET: Prepare for CET enabling Jonathan Nieder
2018-05-08 22:07 ` H.J. Lu
2018-05-08 23:01 ` Jonathan Nieder
2018-05-08 21:01 ` Sam Ravnborg
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=20180508204021.31845-24-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=carlos@redhat.com \
--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).