From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: Szabolcs Nagy <szabolcs.nagy@arm.com>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH 11/12] aarch64: redefine RETURN_ADDRESS to strip PAC
Date: Mon, 11 May 2020 16:15:31 -0300 [thread overview]
Message-ID: <2cb466d5-fae2-d746-45ce-eab06e30562e@linaro.org> (raw)
In-Reply-To: <20200511123850.GI7649@arm.com>
On 11/05/2020 09:38, Szabolcs Nagy wrote:
> The 05/08/2020 14:44, Adhemerval Zanella via Libc-alpha wrote:
>> On 30/04/2020 14:45, Szabolcs Nagy wrote:
>>> +++ b/sysdeps/aarch64/sysdep.h
>>> @@ -35,6 +35,16 @@
>>>
>>> #define PTR_SIZE (1<<PTR_LOG_SIZE)
>>>
>>> +/* Strip pointer authentication code from pointer p. */
>>> +#define XPAC(p) ({ \
>>> + register void *__ra asm ("x30") = (p); \
>>> + asm ("hint 7 // xpaclri" : "+r"(__ra)); \
>>> + __ra;})
>>> +
>>> +/* This is needed when glibc is built with -mbranch-protection=pac-ret. */
>>> +#undef RETURN_ADDRESS
>>> +#define RETURN_ADDRESS(n) XPAC(__builtin_return_address(n))
>>> +
>>
>> Maybe use a inline function instead?
>
> macro seems more reliable to me than always_inline
> when poking at __builtin_return_address and x30,
> but i'm not against always_inline if that's
> considered better.
I would prefer a static inline unless a macro is really required
(either due some compiler limitation or bug).
>
> i'd prefer separate xpac (since it can be used
> not just with __builtin_return_address e.g. for
> stored code address in jmpbuf, which currently
> uses ptrmangling)
Ack.
>
>> #ifndef __ASSEMBLER__
>> # include <sys/cdefs.h>
>
> what is cdefs.h for?
The __always_inline macro.
>
>> /* Strip pointer authentication code from pointer p. */
>> static __always_inline void *
>> return_address (unsigned int n)
>> {
>> register void *ra asm ("x30") = __builtin_return_address (n);
>> asm ("hint 7 // xpaclri" : "+r" (ra));
>> return ra;
>> }
>>
>> /* This is needed when glibc is built with -mbranch-protection=pac-ret. */
>> # undef RETURN_ADDRESS
>> # define RETURN_ADDRESS(n) return_address (n)
>> #endif
next prev parent reply other threads:[~2020-05-11 19:15 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 17:34 [PATCH 00/12] aarch64: branch protection support Szabolcs Nagy
2020-04-30 17:37 ` [PATCH 01/12] elf.h: Add PT_GNU_PROPERTY Szabolcs Nagy
2020-05-07 14:49 ` Adhemerval Zanella
2020-04-30 17:37 ` [PATCH 02/12] elf.h: add aarch64 property definitions Szabolcs Nagy
2020-05-07 14:50 ` Adhemerval Zanella
2020-04-30 17:39 ` [PATCH 03/12] aarch64: Add BTI landing pads to assembly code Szabolcs Nagy
2020-05-07 16:55 ` Adhemerval Zanella
2020-05-11 11:38 ` Szabolcs Nagy
2020-05-11 19:13 ` Adhemerval Zanella
2020-04-30 17:40 ` [PATCH 04/12] aarch64: Rename place holder .S files to .c Szabolcs Nagy
2020-05-07 18:29 ` Adhemerval Zanella
2020-04-30 17:41 ` [PATCH 05/12] aarch64: fix swapcontext for BTI Szabolcs Nagy
2020-05-07 18:42 ` Adhemerval Zanella
2020-04-30 17:42 ` [PATCH 06/12] aarch64: fix RTLD_START " Szabolcs Nagy
2020-05-07 18:49 ` Adhemerval Zanella
2020-05-07 19:24 ` Szabolcs Nagy
2020-05-07 19:55 ` Adhemerval Zanella
2020-05-07 20:14 ` Szabolcs Nagy
2020-05-07 20:20 ` Adhemerval Zanella
2020-04-30 17:42 ` [PATCH 07/12] aarch64: fix syscalls " Szabolcs Nagy
2020-05-07 19:40 ` Adhemerval Zanella
2020-05-11 11:46 ` Szabolcs Nagy
2020-04-30 17:43 ` [PATCH 08/12] Rewrite abi-note.S in C Szabolcs Nagy
2020-04-30 20:07 ` Zack Weinberg
2020-05-01 9:23 ` Szabolcs Nagy
2020-05-01 14:07 ` Zack Weinberg
2020-04-30 17:44 ` [PATCH 09/12] aarch64: support BTI enabled binaries Szabolcs Nagy
2020-05-07 21:07 ` Adhemerval Zanella
2020-05-11 11:04 ` Szabolcs Nagy
2020-05-11 18:38 ` Adhemerval Zanella
2020-04-30 17:44 ` [PATCH 10/12] aarch64: Add pac-ret support to asm files Szabolcs Nagy
2020-05-08 16:59 ` Adhemerval Zanella
2020-05-11 8:27 ` Szabolcs Nagy
2020-05-11 18:39 ` Adhemerval Zanella
2020-04-30 17:45 ` [PATCH 11/12] aarch64: redefine RETURN_ADDRESS to strip PAC Szabolcs Nagy
2020-05-08 17:44 ` Adhemerval Zanella
2020-05-11 12:38 ` Szabolcs Nagy
2020-05-11 19:15 ` Adhemerval Zanella [this message]
2020-05-11 19:21 ` Florian Weimer
2020-05-11 20:13 ` Adhemerval Zanella
2020-05-11 20:18 ` Florian Weimer
2020-05-11 19:22 ` Florian Weimer
2020-05-11 20:45 ` Adhemerval Zanella
2020-05-12 8:42 ` Szabolcs Nagy
2020-04-30 17:45 ` [PATCH 12/12] aarch64: Configure option to build glibc with branch protection Szabolcs Nagy
2020-04-30 19:02 ` Joseph Myers
2020-05-08 17:53 ` Adhemerval Zanella
2020-05-04 11:27 ` [PATCH 00/12] aarch64: branch protection support Szabolcs Nagy
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=2cb466d5-fae2-d746-45ce-eab06e30562e@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
--cc=szabolcs.nagy@arm.com \
/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).