From: Carlos O'Donell <carlos@redhat.com>
To: "H.J. Lu" <hjl.tools@gmail.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 05/24] x86: Add _CET_ENDBR to functions in dl-tlsdesc.S
Date: Fri, 06 Jul 2018 14:50:00 -0000 [thread overview]
Message-ID: <d7a526a7-9b15-c98e-e385-fd0b69b9dd5c@redhat.com> (raw)
In-Reply-To: <20180613153207.57232-6-hjl.tools@gmail.com>
On 06/13/2018 11:31 AM, H.J. Lu wrote:
> Add _CET_ENDBR to functions in dl-tlsdesc.S, which are called indirectly,
> to support IBT.
>
> Tested on i686 and x86-64.
>
> * sysdeps/i386/dl-tlsdesc.S (_dl_tlsdesc_return): Add
> _CET_ENDBR.
> (_dl_tlsdesc_undefweak): Likewise.
> (_dl_tlsdesc_dynamic): Likewise.
> (_dl_tlsdesc_resolve_abs_plus_addend): Likewise.
> (_dl_tlsdesc_resolve_rel): Likewise.
> (_dl_tlsdesc_resolve_rela): Likewise.
> (_dl_tlsdesc_resolve_hold): Likewise.
> * sysdeps/x86_64/dl-tlsdesc.S (_dl_tlsdesc_return): Likewise.
> (_dl_tlsdesc_undefweak): Likewise.
> (_dl_tlsdesc_dynamic): Likewise.
> (_dl_tlsdesc_resolve_rela): Likewise.
> (_dl_tlsdesc_resolve_hold): Likewise.
Please commit.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/i386/dl-tlsdesc.S | 7 +++++++
> sysdeps/x86_64/dl-tlsdesc.S | 5 +++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S
> index 2c4764d1aa..128f0af318 100644
> --- a/sysdeps/i386/dl-tlsdesc.S
> +++ b/sysdeps/i386/dl-tlsdesc.S
> @@ -37,6 +37,7 @@
> cfi_startproc
> .align 16
> _dl_tlsdesc_return:
> + _CET_ENDBR
> movl 4(%eax), %eax
> ret
> cfi_endproc
> @@ -58,6 +59,7 @@ _dl_tlsdesc_return:
> cfi_startproc
> .align 16
> _dl_tlsdesc_undefweak:
> + _CET_ENDBR
> movl 4(%eax), %eax
> subl %gs:0, %eax
> ret
> @@ -99,6 +101,7 @@ _dl_tlsdesc_dynamic (struct tlsdesc *tdp)
> cfi_startproc
> .align 16
> _dl_tlsdesc_dynamic:
> + _CET_ENDBR
> /* Like all TLS resolvers, preserve call-clobbered registers.
> We need two scratch regs anyway. */
> subl $28, %esp
> @@ -154,6 +157,7 @@ _dl_tlsdesc_dynamic:
> .align 16
> _dl_tlsdesc_resolve_abs_plus_addend:
> 0:
> + _CET_ENDBR
> pushl %eax
> cfi_adjust_cfa_offset (4)
> pushl %ecx
> @@ -192,6 +196,7 @@ _dl_tlsdesc_resolve_abs_plus_addend:
> .align 16
> _dl_tlsdesc_resolve_rel:
> 0:
> + _CET_ENDBR
> pushl %eax
> cfi_adjust_cfa_offset (4)
> pushl %ecx
> @@ -230,6 +235,7 @@ _dl_tlsdesc_resolve_rel:
> .align 16
> _dl_tlsdesc_resolve_rela:
> 0:
> + _CET_ENDBR
> pushl %eax
> cfi_adjust_cfa_offset (4)
> pushl %ecx
> @@ -268,6 +274,7 @@ _dl_tlsdesc_resolve_rela:
> .align 16
> _dl_tlsdesc_resolve_hold:
> 0:
> + _CET_ENDBR
> pushl %eax
> cfi_adjust_cfa_offset (4)
> pushl %ecx
> diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S
> index 437bd8cde7..80d771cd88 100644
> --- a/sysdeps/x86_64/dl-tlsdesc.S
> +++ b/sysdeps/x86_64/dl-tlsdesc.S
> @@ -37,6 +37,7 @@
> cfi_startproc
> .align 16
> _dl_tlsdesc_return:
> + _CET_ENDBR
> movq 8(%rax), %rax
> ret
> cfi_endproc
> @@ -58,6 +59,7 @@ _dl_tlsdesc_return:
> cfi_startproc
> .align 16
> _dl_tlsdesc_undefweak:
> + _CET_ENDBR
> movq 8(%rax), %rax
> subq %fs:0, %rax
> ret
> @@ -96,6 +98,7 @@ _dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax"))
> cfi_startproc
> .align 16
> _dl_tlsdesc_dynamic:
> + _CET_ENDBR
> /* Preserve call-clobbered registers that we modify.
> We need two scratch regs anyway. */
> movq %rsi, -16(%rsp)
> @@ -166,6 +169,7 @@ _dl_tlsdesc_dynamic:
> .align 16
> /* The PLT entry will have pushed the link_map pointer. */
> _dl_tlsdesc_resolve_rela:
> + _CET_ENDBR
> cfi_adjust_cfa_offset (8)
> /* Save all call-clobbered registers. Add 8 bytes for push in
> the PLT entry to align the stack. */
> @@ -216,6 +220,7 @@ _dl_tlsdesc_resolve_rela:
> .align 16
> _dl_tlsdesc_resolve_hold:
> 0:
> + _CET_ENDBR
> /* Save all call-clobbered registers. */
> subq $72, %rsp
> cfi_adjust_cfa_offset (72)
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2018-07-06 14:50 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-13 15:32 [PATCH-V2: 00/24] CET: Prepare for CET enabling H.J. Lu
2018-06-13 15:32 ` [PATCH 22/24] i386: Use _CET_NOTRACK in memset-sse2-rep.S H.J. Lu
2018-06-13 15:32 ` [PATCH 24/24] Intel CET: Document --enable-cet H.J. Lu
2018-06-13 15:32 ` [PATCH 14/24] x86-64: Use _CET_NOTRACK in memcpy-ssse3.S H.J. Lu
2018-06-13 15:32 ` [PATCH 09/24] x86_64: Use _CET_NOTRACK in strcmp.S H.J. Lu
2018-07-18 3:17 ` H.J. Lu
2018-06-13 15:32 ` [PATCH 08/24] x86: Update vfork to pop shadow stack H.J. Lu
2018-06-13 15:32 ` [PATCH 19/24] i386: Use _CET_NOTRACK in memcpy-ssse3.S H.J. Lu
2018-06-13 15:32 ` [PATCH 06/24] x86-64: Add _CET_ENDBR to STRCMP_SSE42 H.J. Lu
2018-07-06 14:50 ` Carlos O'Donell
2018-06-13 15:32 ` [PATCH 20/24] i386: Use _CET_NOTRACK in strcpy-sse2.S H.J. Lu
2018-06-13 15:32 ` [PATCH 11/24] x86-64: Use _CET_NOTRACK in strcmp-sse42.S H.J. Lu
2018-06-13 15:32 ` [PATCH 03/24] x86: Support IBT and SHSTK in Intel CET [BZ #21598] H.J. Lu
2018-07-06 19:47 ` Carlos O'Donell
2018-07-07 20:02 ` V2 " H.J. Lu
2018-06-13 15:32 ` [PATCH 13/24] x86-64: Use _CET_NOTRACK in memcmp-sse4.S H.J. Lu
2018-06-13 15:32 ` [PATCH 23/24] x86-64: Add endbr64 to tst-quadmod[12].S H.J. Lu
2018-06-13 15:32 ` [PATCH 17/24] i386: Use _CET_NOTRACK in memcmp-sse4.S H.J. Lu
2018-06-13 15:32 ` [PATCH 02/24] x86: Support shadow stack pointer in setjmp/longjmp H.J. Lu
2018-07-12 18:13 ` Carlos O'Donell
2018-07-13 13:23 ` V2: " H.J. Lu
2018-07-13 18:49 ` Carlos O'Donell
2018-07-14 19:57 ` Florian Weimer
2018-07-14 21:03 ` H.J. Lu
2018-07-14 23:07 ` Florian Weimer
2018-07-14 23:16 ` H.J. Lu
2018-07-14 23:16 ` H.J. Lu
2018-07-15 8:07 ` Florian Weimer
2018-07-15 13:54 ` H.J. Lu
2018-07-15 20:20 ` Florian Weimer
2018-07-15 22:01 ` H.J. Lu
2018-06-13 15:32 ` [PATCH 04/24] x86: Add _CET_ENDBR to functions in crti.S H.J. Lu
2018-07-06 14:50 ` Carlos O'Donell
2018-07-06 17:01 ` H.J. Lu
2018-07-06 18:48 ` Carlos O'Donell
2018-06-13 15:32 ` [PATCH 16/24] i386: Use _CET_NOTRACK in memset-sse2.S H.J. Lu
2018-06-13 15:32 ` [PATCH 21/24] i386: Use _CET_NOTRACK in strcat-sse2.S H.J. Lu
2018-06-13 15:32 ` [PATCH 01/24] x86: Rename __glibc_reserved1 to feature_1 in tcbhead_t [BZ #22563] H.J. Lu
2018-07-13 13:19 ` V2: " H.J. Lu
2018-07-13 18:51 ` Carlos O'Donell
2018-07-13 18:55 ` Jeff Law
2018-07-13 19:05 ` Carlos O'Donell
2018-07-13 19:11 ` Jeff Law
2018-07-13 19:22 ` Florian Weimer
2018-07-13 20:21 ` Carlos O'Donell
2018-06-13 15:32 ` [PATCH 10/24] x86-64: Use _CET_NOTRACK in strcpy-sse2-unaligned.S H.J. Lu
2018-06-13 15:32 ` [PATCH 05/24] x86: Add _CET_ENDBR to functions in dl-tlsdesc.S H.J. Lu
2018-07-06 14:50 ` Carlos O'Donell [this message]
2018-06-13 15:32 ` [PATCH 15/24] i386: Use _CET_NOTRACK in i686/memcmp.S H.J. Lu
2018-06-13 15:32 ` [PATCH 12/24] x86-64: Use _CET_NOTRACK in memcpy-ssse3-back.S H.J. Lu
2018-06-13 15:32 ` [PATCH 18/24] i386: Use _CET_NOTRACK in memcpy-ssse3-rep.S H.J. Lu
2018-06-13 15:32 ` [PATCH 07/24] i386: Add _CET_ENDBR to indirect jump targets in add_n.S/sub_n.S H.J. Lu
2018-07-06 14:50 ` Carlos O'Donell
2018-07-02 14:54 ` [PATCH-V2: 00/24] CET: Prepare for CET enabling H.J. Lu
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=d7a526a7-9b15-c98e-e385-fd0b69b9dd5c@redhat.com \
--to=carlos@redhat.com \
--cc=hjl.tools@gmail.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).