From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: wangboshi <wangboshi@huawei.com>, libc-alpha@sourceware.org
Cc: nd@arm.com
Subject: Re: [RFC][PATCH] AArch64: use movz/movk instead of literal pools in start.S
Date: Mon, 11 Sep 2017 09:11:00 -0000 [thread overview]
Message-ID: <59B65347.503@arm.com> (raw)
In-Reply-To: <e65025af-5168-c999-bfc1-7ac614314836@huawei.com>
On 07/09/17 08:33, wangboshi wrote:
> eXecute-Only Memory (XOM) is a protection mechanism against some ROP attacks. XOM sets the code as executable
> and unreadable, so the access to any data, like literal pools, in the code section causes the fault with XOM.
> The compiler can disable literal pools for C source files, but not for assembly files, so I use movz/movk
> instead of literal pools in start.S for XOM.
>
> I add MOVL macro with movz/movk instructions like movl pseudo-instruction in armasm, and use the macro instead
> of literal pools.
>
>
> 2017-09-07 Wang Boshi <wangboshi@huawei.com>
>
> * sysdeps/aarch64/start.S: Use MOVL instead of literal pools.
> * sysdeps/aarch64/sysdep.h (MOVL): Add MOVL macro.
>
thanks, the patch looks good to me (except for a nit below),
do you have copyright assignment?
do you have commit rights to the glibc repo?
> diff --git a/sysdeps/aarch64/start.S b/sysdeps/aarch64/start.S
> index df1c642..51e8e82 100644
> --- a/sysdeps/aarch64/start.S
> +++ b/sysdeps/aarch64/start.S
> @@ -71,9 +71,9 @@ _start:
> ldr PTR_REG (4), [x4, #:got_lo12:__libc_csu_fini]
> #else
> /* Set up the other arguments in registers */
> - ldr PTR_REG (0), =main
> - ldr PTR_REG (3), =__libc_csu_init
> - ldr PTR_REG (4), =__libc_csu_fini
> + MOVL(0, main)
> + MOVL(3, __libc_csu_init)
> + MOVL(4, __libc_csu_fini)
> #endif
>
> /* __libc_start_main (main, argc, argv, init, fini, rtld_fini,
> diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
> index a749a70..0a11b57 100644
> --- a/sysdeps/aarch64/sysdep.h
> +++ b/sysdeps/aarch64/sysdep.h
> @@ -137,6 +137,20 @@
> ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \
> OP PTR_REG (R), [x##T];
>
> +/* Load an immediate into R.
> + Note R is a register number and not a register name. */
either rename the macro argument to R or use N in the comment.
> +#ifdef __LP64__
> +# define MOVL(n, name) \
> + movz PTR_REG(n), #:abs_g3:name; \
> + movk PTR_REG(n), #:abs_g2_nc:name; \
> + movk PTR_REG(n), #:abs_g1_nc:name; \
> + movk PTR_REG(n), #:abs_g0_nc:name;
> +#else
> +# define MOVL(n, name) \
> + movz PTR_REG(n), #:abs_g1:name; \
> + movk PTR_REG(n), #:abs_g0_nc:name;
> +#endif
> +
> /* Since C identifiers are not normally prefixed with an underscore
> on this system, the asm identifier `syscall_error' intrudes on the
> C name space. Make sure we use an innocuous name. */
>
>
next prev parent reply other threads:[~2017-09-11 9:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-07 7:34 wangboshi
2017-09-07 11:43 ` Florian Weimer
2017-09-11 8:58 ` Szabolcs Nagy
2017-09-11 9:09 ` Andrew Pinski
2017-09-11 9:24 ` Szabolcs Nagy
2017-09-12 8:54 ` Boshi Wang
2017-09-11 9:11 ` Szabolcs Nagy [this message]
[not found] ` <336560e5-c9de-08bc-c850-28994cac2c33@huawei.com>
2017-09-14 8:35 ` Szabolcs Nagy
2017-09-15 1:16 ` Boshi Wang
2017-09-18 17:21 ` 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=59B65347.503@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=libc-alpha@sourceware.org \
--cc=nd@arm.com \
--cc=wangboshi@huawei.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).