From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: Re: V2 [PATCH 3/5] i386: Add _CET_ENDBR to assembly files without ENTRY
Date: Thu, 9 Jan 2020 18:13:36 -0300 [thread overview]
Message-ID: <5d8a8c7b-a6f1-f70f-9783-31672593c156@linaro.org> (raw)
In-Reply-To: <20200108161535.6141-4-hjl.tools@gmail.com>
On 08/01/2020 13:15, H.J. Lu wrote:
> Add _CET_ENDBR to i386 assembly files which don't use ENTRY to add
> ENDBR32 at function entries when CET is enabled.
> ---
> sysdeps/i386/i386-mcount.S | 2 ++
> sysdeps/i386/nptl/pthread_spin_lock.S | 2 ++
> sysdeps/i386/nptl/pthread_spin_unlock.S | 3 +++
> sysdeps/i386/pthread_spin_trylock.S | 2 ++
> 4 files changed, 9 insertions(+)
>
> diff --git a/sysdeps/i386/i386-mcount.S b/sysdeps/i386/i386-mcount.S
> index 9516265bcb..8b60bd20fe 100644
> --- a/sysdeps/i386/i386-mcount.S
> +++ b/sysdeps/i386/i386-mcount.S
> @@ -30,6 +30,7 @@
> .type C_SYMBOL_NAME(_mcount), @function
> .align ALIGNARG(4)
> C_LABEL(_mcount)
> + _CET_ENDBR
> /* Save the caller-clobbered registers. */
> pushl %eax
> pushl %ecx
> @@ -58,6 +59,7 @@ weak_alias (_mcount, mcount)
> .type C_SYMBOL_NAME(__fentry__), @function
> .align ALIGNARG(4)
> C_LABEL(__fentry__)
> + _CET_ENDBR
> /* Save the caller-clobbered registers. */
> pushl %eax
> pushl %ecx
Ok, ENTRY will issue CALL_MCOUNT itself.
> diff --git a/sysdeps/i386/nptl/pthread_spin_lock.S b/sysdeps/i386/nptl/pthread_spin_lock.S
> index 5736c82078..7eb8f0e069 100644
> --- a/sysdeps/i386/nptl/pthread_spin_lock.S
> +++ b/sysdeps/i386/nptl/pthread_spin_lock.S
> @@ -15,12 +15,14 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> +#include <sysdep.h>
> #include <lowlevellock.h>
>
> .globl pthread_spin_lock
> .type pthread_spin_lock,@function
> .align 16
> pthread_spin_lock:
> + _CET_ENDBR
> mov 4(%esp), %eax
> 1: LOCK
> decl 0(%eax)
I think we can use ENTRY/END here instead.
> diff --git a/sysdeps/i386/nptl/pthread_spin_unlock.S b/sysdeps/i386/nptl/pthread_spin_unlock.S
> index e7757d0a03..dac730af1f 100644
> --- a/sysdeps/i386/nptl/pthread_spin_unlock.S
> +++ b/sysdeps/i386/nptl/pthread_spin_unlock.S
> @@ -16,10 +16,13 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> +#include <sysdep.h>
> +
> .globl pthread_spin_unlock
> .type pthread_spin_unlock,@function
> .align 16
> pthread_spin_unlock:
> + _CET_ENDBR
> movl 4(%esp), %eax
> movl $1, (%eax)
> xorl %eax, %eax
Ditto.
> diff --git a/sysdeps/i386/pthread_spin_trylock.S b/sysdeps/i386/pthread_spin_trylock.S
> index dd08d38f8d..b3965a150f 100644
> --- a/sysdeps/i386/pthread_spin_trylock.S
> +++ b/sysdeps/i386/pthread_spin_trylock.S
> @@ -16,6 +16,7 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> +#include <sysdep.h>
> #include <pthread-errnos.h>
>
>
> @@ -29,6 +30,7 @@
> .type pthread_spin_trylock,@function
> .align 16
> pthread_spin_trylock:
> + _CET_ENDBR
> movl 4(%esp), %edx
> movl $1, %eax
> xorl %ecx, %ecx
>
Ditto.
next prev parent reply other threads:[~2020-01-09 21:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 16:15 V2 [PATCH 0/5] i386: Finish CET support H.J. Lu
2020-01-08 16:15 ` V2 [PATCH 1/5] i386: Don't unnecessarily save and restore EAX, ECX and EDX [BZ# 25262] H.J. Lu
2020-01-09 21:13 ` Adhemerval Zanella
2020-01-08 16:15 ` V2 [PATCH 2/5] i386/sub_n.S: Add a missing _CET_ENDBR to indirect jump target H.J. Lu
2020-01-09 21:13 ` Adhemerval Zanella
2020-01-08 16:15 ` V2 [PATCH 3/5] i386: Add _CET_ENDBR to assembly files without ENTRY H.J. Lu
2020-01-09 21:13 ` Adhemerval Zanella [this message]
2020-01-08 16:15 ` V2 [PATCH 4/5] i386: Remove _exit.S H.J. Lu
2020-01-09 21:14 ` Adhemerval Zanella
2020-01-08 16:15 ` V2 [PATCH 5/5] i386: Enable CET support in ucontext functions H.J. Lu
2020-02-01 14:09 ` V3 [PATCH] " H.J. Lu
2020-02-13 17:04 ` V4 " H.J. Lu
2020-02-14 22:10 ` V3 " Carlos O'Donell
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d8a8c7b-a6f1-f70f-9783-31672593c156@linaro.org \
--to=adhemerval.zanella@linaro.org \
--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).